tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

USB: drop tty argument from usb_serial_handle_sysrq_char()

Since handle_sysrq() does not take tty as argument anymore we can
drop it from usb_serial_handle_sysrq_char() as well.

Acked-by: Alan Cox <alan@lxorguk.ukuu.org.uk>
Acked-by: Jason Wessel <jason.wessel@windriver.com>
Acked-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>

Dmitry Torokhov 6ee9f4b4 f335397d

+7 -10
+1 -1
drivers/usb/serial/ftdi_sio.c
··· 1831 1831 1832 1832 if (port->port.console && port->sysrq) { 1833 1833 for (i = 0; i < len; i++, ch++) { 1834 - if (!usb_serial_handle_sysrq_char(tty, port, *ch)) 1834 + if (!usb_serial_handle_sysrq_char(port, *ch)) 1835 1835 tty_insert_flip_char(tty, *ch, flag); 1836 1836 } 1837 1837 } else {
+3 -5
drivers/usb/serial/generic.c
··· 343 343 tty_insert_flip_string(tty, ch, urb->actual_length); 344 344 else { 345 345 for (i = 0; i < urb->actual_length; i++, ch++) { 346 - if (!usb_serial_handle_sysrq_char(tty, port, *ch)) 346 + if (!usb_serial_handle_sysrq_char(port, *ch)) 347 347 tty_insert_flip_char(tty, *ch, TTY_NORMAL); 348 348 } 349 349 } ··· 448 448 EXPORT_SYMBOL_GPL(usb_serial_generic_unthrottle); 449 449 450 450 #ifdef CONFIG_MAGIC_SYSRQ 451 - int usb_serial_handle_sysrq_char(struct tty_struct *tty, 452 - struct usb_serial_port *port, unsigned int ch) 451 + int usb_serial_handle_sysrq_char(struct usb_serial_port *port, unsigned int ch) 453 452 { 454 453 if (port->sysrq && port->port.console) { 455 454 if (ch && time_before(jiffies, port->sysrq)) { ··· 461 462 return 0; 462 463 } 463 464 #else 464 - int usb_serial_handle_sysrq_char(struct tty_struct *tty, 465 - struct usb_serial_port *port, unsigned int ch) 465 + int usb_serial_handle_sysrq_char(struct usb_serial_port *port, unsigned int ch) 466 466 { 467 467 return 0; 468 468 }
+1 -1
drivers/usb/serial/pl2303.c
··· 788 788 789 789 if (port->port.console && port->sysrq) { 790 790 for (i = 0; i < urb->actual_length; ++i) 791 - if (!usb_serial_handle_sysrq_char(tty, port, data[i])) 791 + if (!usb_serial_handle_sysrq_char(port, data[i])) 792 792 tty_insert_flip_char(tty, data[i], tty_flag); 793 793 } else { 794 794 tty_insert_flip_string_fixed_flag(tty, data, tty_flag,
+1 -1
drivers/usb/serial/ssu100.c
··· 596 596 597 597 if (port->port.console && port->sysrq) { 598 598 for (i = 0; i < len; i++, ch++) { 599 - if (!usb_serial_handle_sysrq_char(tty, port, *ch)) 599 + if (!usb_serial_handle_sysrq_char(port, *ch)) 600 600 tty_insert_flip_char(tty, *ch, flag); 601 601 } 602 602 } else
+1 -2
include/linux/usb/serial.h
··· 342 342 extern void usb_serial_generic_process_read_urb(struct urb *urb); 343 343 extern int usb_serial_generic_prepare_write_buffer(struct usb_serial_port *port, 344 344 void *dest, size_t size); 345 - extern int usb_serial_handle_sysrq_char(struct tty_struct *tty, 346 - struct usb_serial_port *port, 345 + extern int usb_serial_handle_sysrq_char(struct usb_serial_port *port, 347 346 unsigned int ch); 348 347 extern int usb_serial_handle_break(struct usb_serial_port *port); 349 348