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

Commit bd5afa9e authored by Jason Wessel's avatar Jason Wessel Committed by Greg Kroah-Hartman
Browse files

usb-serial: Use tty_port version console instead of usb_serial_port 



Replace all instances of using the console variable in struct
usb_serial_port with the struct tty_port version.

CC: Alan Cox <alan@linux.intel.com>
CC: Alan Stern <stern@rowland.harvard.edu>
CC: Oliver Neukum <oliver@neukum.org>
CC: Andrew Morton <akpm@linux-foundation.org>
CC: linux-usb@vger.kernel.org
CC: linux-kernel@vger.kernel.org
Signed-off-by: default avatarJason Wessel <jason.wessel@windriver.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 9757de38

drivers/usb/serial/console.c

+2 −3
Original line number Diff line number Diff line
@@ -180,7 +180,6 @@ static int usb_console_setup(struct console *co, char *options) 
	--port->port.count;

	/* The console is special in terms of closing the device so

	 * indicate this port is now acting as a system console. */

	port->console = 1;

	port->port.console = 1;



	mutex_unlock(&serial->disc_mutex);
@@ -217,7 +216,7 @@ static void usb_console_write(struct console *co, 


	dbg("%s - port %d, %d byte(s)", __func__, port->number, count);



	if (!port->console) {

	if (!port->port.console) {

		dbg("%s - port not opened", __func__);

		return;

	}
@@ -313,7 +312,7 @@ void usb_serial_console_exit(void) 
{

	if (usbcons_info.port) {

		unregister_console(&usbcons);

		usbcons_info.port->console = 0;

		usbcons_info.port->port.console = 0;

		usbcons_info.port = NULL;

	}

}

drivers/usb/serial/ftdi_sio.c

+1 −1
Original line number Diff line number Diff line
@@ -2074,7 +2074,7 @@ static int ftdi_process_packet(struct tty_struct *tty, 
		return 0;	/* status only */

	ch = packet + 2;



	if (!(port->console && port->sysrq) && flag == TTY_NORMAL)

	if (!(port->port.console && port->sysrq) && flag == TTY_NORMAL)

		tty_insert_flip_string(tty, ch, len);

	else {

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

drivers/usb/serial/generic.c

+2 −2
Original line number Diff line number Diff line
@@ -447,7 +447,7 @@ static void flush_and_resubmit_read_urb(struct usb_serial_port *port) 
	/* The per character mucking around with sysrq path it too slow for

	   stuff like 3G modems, so shortcircuit it in the 99.9999999% of cases

	   where the USB serial is not a console anyway */

	if (!port->console || !port->sysrq)

	if (!port->port.console || !port->sysrq)

		tty_insert_flip_string(tty, ch, urb->actual_length);

	else {

		/* Push data to tty */
@@ -561,7 +561,7 @@ void usb_serial_generic_unthrottle(struct tty_struct *tty) 
int usb_serial_handle_sysrq_char(struct tty_struct *tty,

			struct usb_serial_port *port, unsigned int ch)

{

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

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

		if (ch && time_before(jiffies, port->sysrq)) {

			handle_sysrq(ch, tty);

			port->sysrq = 0;

drivers/usb/serial/pl2303.c

+1 −1
Original line number Diff line number Diff line
@@ -1058,7 +1058,7 @@ static void pl2303_push_data(struct tty_struct *tty, 
	if (line_status & UART_OVERRUN_ERROR)

		tty_insert_flip_char(tty, 0, TTY_OVERRUN);



	if (tty_flag == TTY_NORMAL && !(port->console && port->sysrq))

	if (tty_flag == TTY_NORMAL && !(port->port.console && port->sysrq))

		tty_insert_flip_string(tty, data, urb->actual_length);

	else {

		int i;

drivers/usb/serial/usb-serial.c

+2 −2
Original line number Diff line number Diff line
@@ -289,7 +289,7 @@ static void serial_down(struct tty_port *tport) 
	 * The console is magical.  Do not hang up the console hardware

	 * or there will be tears.

	 */

	if (port->console)

	if (port->port.console)

		return;

	if (drv->close)

		drv->close(port);
@@ -328,7 +328,7 @@ static void serial_cleanup(struct tty_struct *tty) 
	/* The console is magical.  Do not hang up the console hardware

	 * or there will be tears.

	 */

	if (port->console)

	if (port->port.console)

		return;



	dbg("%s - port %d", __func__, port->number);