tty: remove empty tty_operations::set_termios

tty_operations::set_termios is optional. If it doesn't exist, nothing is
called. So remove almost¹ empty set_termios implementations.

¹ capi had an useless pr_debug in it.

Signed-off-by: Jiri Slaby <jslaby@suse.cz>
Cc: Jeff Dike <jdike@addtoit.com>
Cc: Richard Weinberger <richard@nod.at>
Cc: Karsten Keil <isdn@linux-pingi.de>
Acked-By: Anton Ivanov <anton.ivanov@cambridgegreys.com>
Link: https://lore.kernel.org/r/20210505091928.22010-32-jslaby@suse.cz
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/arch/um/drivers/line.c b/arch/um/drivers/line.c
index 159434851417f8735e9a4559105970ba5177fab7..fbc623d2cc0765e5fbb93645a62e5012e30cc40a 100644 (file)
--- a/arch/um/drivers/line.c
+++ b/arch/um/drivers/line.c
@@ -211,11 +211,6 @@ out_up:
        return ret;
 }
 
-void line_set_termios(struct tty_struct *tty, struct ktermios * old)
-{
-       /* nothing */
-}
-
 void line_throttle(struct tty_struct *tty)
 {
        struct line *line = tty->driver_data;

diff --git a/arch/um/drivers/line.h b/arch/um/drivers/line.h
index 3325e2bc64e40585577cc361eaaf4a3f3df1c7fc..bdb16b96e76fd0027ec1b667df1195ca9910704f 100644 (file)
--- a/arch/um/drivers/line.h
+++ b/arch/um/drivers/line.h
@@ -66,7 +66,6 @@ extern int line_setup(char **conf, unsigned nlines, char **def,
                      char *init, char *name);
 extern int line_write(struct tty_struct *tty, const unsigned char *buf,
                      int len);
-extern void line_set_termios(struct tty_struct *tty, struct ktermios * old);
 extern unsigned int line_chars_in_buffer(struct tty_struct *tty);
 extern void line_flush_buffer(struct tty_struct *tty);
 extern void line_flush_chars(struct tty_struct *tty);

diff --git a/arch/um/drivers/ssl.c b/arch/um/drivers/ssl.c
index 6476b28d7c5ec0707b62d88fdf71a99b46deff0e..41eae2e8fb652c07e1ace961ba5517a4a37f5266 100644 (file)
--- a/arch/um/drivers/ssl.c
+++ b/arch/um/drivers/ssl.c
@@ -99,7 +99,6 @@ static const struct tty_operations ssl_ops = {
        .chars_in_buffer        = line_chars_in_buffer,
        .flush_buffer           = line_flush_buffer,
        .flush_chars            = line_flush_chars,
-       .set_termios            = line_set_termios,
        .throttle               = line_throttle,
        .unthrottle             = line_unthrottle,
        .install                = ssl_install,

diff --git a/arch/um/drivers/stdio_console.c b/arch/um/drivers/stdio_console.c
index 37b127941e6f1582c78f79c107608bdc0698ed45..e8b762f4d8c25d2c5824a1c601367965c6d08b74 100644 (file)
--- a/arch/um/drivers/stdio_console.c
+++ b/arch/um/drivers/stdio_console.c
@@ -106,7 +106,6 @@ static const struct tty_operations console_ops = {
        .chars_in_buffer        = line_chars_in_buffer,
        .flush_buffer           = line_flush_buffer,
        .flush_chars            = line_flush_chars,
-       .set_termios            = line_set_termios,
        .throttle               = line_throttle,
        .unthrottle             = line_unthrottle,
        .hangup                 = line_hangup,

diff --git a/drivers/isdn/capi/capi.c b/drivers/isdn/capi/capi.c
index 6d99b93bb09e6210f23a05cdcadd49d15e2d8212..693b0bc31395e9da83b4f022d12ae14a214e2ab1 100644 (file)
--- a/drivers/isdn/capi/capi.c
+++ b/drivers/isdn/capi/capi.c
@@ -1197,11 +1197,6 @@ static unsigned int capinc_tty_chars_in_buffer(struct tty_struct *tty)
        return mp->outbytes;
 }
 
-static void capinc_tty_set_termios(struct tty_struct *tty, struct ktermios *old)
-{
-       pr_debug("capinc_tty_set_termios\n");
-}
-
 static void capinc_tty_throttle(struct tty_struct *tty)
 {
        struct capiminor *mp = tty->driver_data;
@@ -1267,7 +1262,6 @@ static const struct tty_operations capinc_ops = {
        .flush_chars = capinc_tty_flush_chars,
        .write_room = capinc_tty_write_room,
        .chars_in_buffer = capinc_tty_chars_in_buffer,
-       .set_termios = capinc_tty_set_termios,
        .throttle = capinc_tty_throttle,
        .unthrottle = capinc_tty_unthrottle,
        .stop = capinc_tty_stop,