From 3a7d530a0cf9b82fce3596627259a67c511ec917 Mon Sep 17 00:00:00 2001 From: Jiri Slaby Date: Wed, 5 May 2021 11:19:01 +0200 Subject: [PATCH] n_tty: do only one cp dereference in n_tty_receive_buf_standard 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 Link: https://lore.kernel.org/r/20210505091928.22010-9-jslaby@suse.cz Signed-off-by: Greg Kroah-Hartman --- 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 b8f9814..e7c9dce14 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.7.4