diff options
| author |   Jiri Slaby <jslaby@suse.cz> | 2021-05-05 11:19:01 +0200 |
|---|---|---|
| committer |   Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-05-13 16:57:16 +0200 |
| commit | 3a7d530a0cf9b82fce3596627259a67c511ec917 (patch) | |
| tree | b89237e8b598d1e74db26ba0b90152bb41700804 /drivers | |
| parent | n_tty: make n_tty_receive_char_special return void (diff) | |
| download | linux-dev-3a7d530a0cf9b82fce3596627259a67c511ec917.tar.xz linux-dev-3a7d530a0cf9b82fce3596627259a67c511ec917.zip | |
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 <jslaby@suse.cz>
Link: https://lore.kernel.org/r/20210505091928.22010-9-jslaby@suse.cz
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/tty/n_tty.c | 8 |
1 files 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); } } |