[PATCH 08/35] n_tty: do only one cp dereference in n_tty_receive_buf_standard

From: Jiri Slaby
Date: Wed May 05 2021 - 05:20:01 EST


It might be confusing for readers: there are three distinct dereferences
and increments of 'cp' in n_tty_receive_buf_standard. Do it on a single
place, along with/before the 'fp' dereference.

Signed-off-by: Jiri Slaby <jslaby@xxxxxxx>
---
drivers/tty/n_tty.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/tty/n_tty.c b/drivers/tty/n_tty.c
index b8f981499465..e7c9dce14f88 100644
--- a/drivers/tty/n_tty.c
+++ b/drivers/tty/n_tty.c
@@ -1531,17 +1531,17 @@ static void n_tty_receive_buf_standard(struct tty_struct *tty,
char flag = TTY_NORMAL;

while (count--) {
+ unsigned char c = *cp++;
+
if (fp)
flag = *fp++;

if (ldata->lnext) {
- n_tty_receive_char_lnext(tty, *cp++, flag);
+ n_tty_receive_char_lnext(tty, c, flag);
continue;
}

if (likely(flag == TTY_NORMAL)) {
- unsigned char c = *cp++;
-
if (I_ISTRIP(tty))
c &= 0x7f;
if (I_IUCLC(tty) && L_IEXTEN(tty))
@@ -1555,7 +1555,7 @@ static void n_tty_receive_buf_standard(struct tty_struct *tty,
else
n_tty_receive_char_special(tty, c);
} else
- n_tty_receive_char_flagged(tty, *cp++, flag);
+ n_tty_receive_char_flagged(tty, c, flag);
}
}

--
2.31.1