From: Jiri Slaby Date: Mon, 15 Jun 2020 07:48:52 +0000 (+0200) Subject: vc: simplify condition in vc_con_write_normal X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=6923e2d793213283d808e60c390fe0b5e9090c7e;p=linux.git vc: simplify condition in vc_con_write_normal Convert (!(A && !B) || C) into (!A || B || C) to improve readability. No functional changes, as was just proven by objdump. Signed-off-by: Jiri Slaby Link: https://lore.kernel.org/r/20200615074910.19267-20-jslaby@suse.cz Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/tty/vt/vt.c b/drivers/tty/vt/vt.c index 893f72dc812c3..d3cd256ba0fa2 100644 --- a/drivers/tty/vt/vt.c +++ b/drivers/tty/vt/vt.c @@ -2747,7 +2747,7 @@ static int vc_con_write_normal(struct vc_data *vc, int tc, int c, return -1; /* nothing to display */ /* Glyph not found */ - if ((!(vc->vc_utf && !vc->vc_disp_ctrl) || c < 128) && + if ((!vc->vc_utf || vc->vc_disp_ctrl || c < 128) && !(c & ~charmask)) { /* * In legacy mode use the glyph we get by a 1:1