Re: [PATCH 31/35] tty: remove empty tty_operations::set_termios

[Anton Ivanov]

On 05/05/2021 10:19, Jiri Slaby wrote:
> 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@xxxxxxx>
> Cc: Jeff Dike <jdike@xxxxxxxxxxx>
> Cc: Richard Weinberger <richard@xxxxxx>
> Cc: Anton Ivanov <anton.ivanov@xxxxxxxxxxxxxxxxxx>
> Cc: Karsten Keil <isdn@xxxxxxxxxxxxxx>
> ---
>   arch/um/drivers/line.c          | 5 -----
>   arch/um/drivers/line.h          | 1 -
>   arch/um/drivers/ssl.c           | 1 -
>   arch/um/drivers/stdio_console.c | 1 -
>   drivers/isdn/capi/capi.c        | 6 ------
>   5 files changed, 14 deletions(-)
>
> diff --git a/arch/um/drivers/line.c b/arch/um/drivers/line.c
> index 159434851417..fbc623d2cc07 100644
> --- a/arch/um/drivers/line.c
> +++ b/arch/um/drivers/line.c
> @@ -211,11 +211,6 @@ int line_write(struct tty_struct *tty, const unsigned char *buf, int len)
>   	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 3325e2bc64e4..bdb16b96e76f 100644
> --- 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 6476b28d7c5e..41eae2e8fb65 100644
> --- 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 37b127941e6f..e8b762f4d8c2 100644
> --- 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 6d99b93bb09e..693b0bc31395 100644
> --- 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,

Acked-By: Anton Ivanov <anton.ivanov@xxxxxxxxxxxxxxxxxx>

--
Anton R. Ivanov
Cambridgegreys Limited. Registered in England. Company Number 10273661
https://www.cambridgegreys.com/