[PATCH 20/38] vc: simplify condition in vc_con_write_normal

From: Jiri Slaby
Date: Mon Jun 15 2020 - 03:50:42 EST


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@xxxxxxx>
---
drivers/tty/vt/vt.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/tty/vt/vt.c b/drivers/tty/vt/vt.c
index 893f72dc812c..d3cd256ba0fa 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
--
2.27.0