Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6ee9f4b4 authored by Dmitry Torokhov's avatar Dmitry Torokhov
Browse files

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: default avatarAlan Cox <alan@lxorguk.ukuu.org.uk>
Acked-by: default avatarJason Wessel <jason.wessel@windriver.com>
Acked-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: default avatarDmitry Torokhov <dtor@mail.ru>
parent f335397d

drivers/usb/serial/ftdi_sio.c

+1 −1
Original line number Diff line number Diff line
@@ -1831,7 +1831,7 @@ static int ftdi_process_packet(struct tty_struct *tty, 


	if (port->port.console && port->sysrq) {

		for (i = 0; i < len; i++, ch++) {

			if (!usb_serial_handle_sysrq_char(tty, port, *ch))

			if (!usb_serial_handle_sysrq_char(port, *ch))

				tty_insert_flip_char(tty, *ch, flag);

		}

	} else {

drivers/usb/serial/generic.c

+3 −5
Original line number Diff line number Diff line
@@ -343,7 +343,7 @@ void usb_serial_generic_process_read_urb(struct urb *urb) 
		tty_insert_flip_string(tty, ch, urb->actual_length);

	else {

		for (i = 0; i < urb->actual_length; i++, ch++) {

			if (!usb_serial_handle_sysrq_char(tty, port, *ch))

			if (!usb_serial_handle_sysrq_char(port, *ch))

				tty_insert_flip_char(tty, *ch, TTY_NORMAL);

		}

	}
@@ -448,8 +448,7 @@ void usb_serial_generic_unthrottle(struct tty_struct *tty) 
EXPORT_SYMBOL_GPL(usb_serial_generic_unthrottle);



#ifdef CONFIG_MAGIC_SYSRQ

int usb_serial_handle_sysrq_char(struct tty_struct *tty,

			struct usb_serial_port *port, unsigned int ch)

int usb_serial_handle_sysrq_char(struct usb_serial_port *port, unsigned int ch)

{

	if (port->sysrq && port->port.console) {

		if (ch && time_before(jiffies, port->sysrq)) {
@@ -462,8 +461,7 @@ int usb_serial_handle_sysrq_char(struct tty_struct *tty, 
	return 0;

}

#else

int usb_serial_handle_sysrq_char(struct tty_struct *tty,

			struct usb_serial_port *port, unsigned int ch)

int usb_serial_handle_sysrq_char(struct usb_serial_port *port, unsigned int ch)

{

	return 0;

}

drivers/usb/serial/pl2303.c

+1 −1
Original line number Diff line number Diff line
@@ -788,7 +788,7 @@ static void pl2303_process_read_urb(struct urb *urb) 


	if (port->port.console && port->sysrq) {

		for (i = 0; i < urb->actual_length; ++i)

			if (!usb_serial_handle_sysrq_char(tty, port, data[i]))

			if (!usb_serial_handle_sysrq_char(port, data[i]))

				tty_insert_flip_char(tty, data[i], tty_flag);

	} else {

		tty_insert_flip_string_fixed_flag(tty, data, tty_flag,

drivers/usb/serial/ssu100.c

+1 −1
Original line number Diff line number Diff line
@@ -596,7 +596,7 @@ static int ssu100_process_packet(struct tty_struct *tty, 


	if (port->port.console && port->sysrq) {

		for (i = 0; i < len; i++, ch++) {

			if (!usb_serial_handle_sysrq_char(tty, port, *ch))

			if (!usb_serial_handle_sysrq_char(port, *ch))

				tty_insert_flip_char(tty, *ch, flag);

		}

	} else

include/linux/usb/serial.h

+1 −2
Original line number Diff line number Diff line
@@ -342,8 +342,7 @@ extern int usb_serial_generic_submit_read_urb(struct usb_serial_port *port, 
extern void usb_serial_generic_process_read_urb(struct urb *urb);

extern int usb_serial_generic_prepare_write_buffer(struct usb_serial_port *port,

						void *dest, size_t size);

extern int usb_serial_handle_sysrq_char(struct tty_struct *tty,

					struct usb_serial_port *port,

extern int usb_serial_handle_sysrq_char(struct usb_serial_port *port,

					unsigned int ch);

extern int usb_serial_handle_break(struct usb_serial_port *port);