n_tty: pass ldata to canon_skip_eof() directly
authorJiri Slaby <jirislaby@kernel.org>
Wed, 12 Jul 2023 06:42:15 +0000 (08:42 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 25 Jul 2023 17:19:39 +0000 (19:19 +0200)
'tty' is not needed in canon_skip_eof(), so we can pass 'ldata' directly
instead.

Signed-off-by: Jiri Slaby (SUSE) <jirislaby@kernel.org>
Link: https://lore.kernel.org/r/20230712064216.12150-4-jirislaby@kernel.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/tty/n_tty.c

index c1859ae..bab7005 100644 (file)
@@ -2053,9 +2053,8 @@ static bool canon_copy_from_read_buf(struct tty_struct *tty,
  * EOF (special EOL character that's a __DISABLED_CHAR)
  * in the stream, silently eat the EOF.
  */
-static void canon_skip_eof(struct tty_struct *tty)
+static void canon_skip_eof(struct n_tty_data *ldata)
 {
-       struct n_tty_data *ldata = tty->disc_data;
        size_t tail, canon_head;
 
        canon_head = smp_load_acquire(&ldata->canon_head);
@@ -2153,7 +2152,7 @@ static ssize_t n_tty_read(struct tty_struct *tty, struct file *file,
                         * releasing the lock and returning done.
                         */
                        if (!nr)
-                               canon_skip_eof(tty);
+                               canon_skip_eof(ldata);
                        else if (canon_copy_from_read_buf(tty, &kb, &nr))
                                return kb - kbuf;
                } else {