vc: simplify condition in vc_con_write_normal
authorJiri Slaby <jslaby@suse.cz>
Mon, 15 Jun 2020 07:48:52 +0000 (09:48 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 24 Jun 2020 15:08:33 +0000 (17:08 +0200)
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 <jslaby@suse.cz>
Link: https://lore.kernel.org/r/20200615074910.19267-20-jslaby@suse.cz
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/tty/vt/vt.c

index 893f72d..d3cd256 100644 (file)
@@ -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