Commit 4dbd5a09 authored by Alan Cox's avatar Alan Cox Committed by Linus Torvalds
Browse files

tty-usb-console: tidy the USB console code 



Code tidy

Signed-off-by: default avatarAlan Cox <alan@redhat.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent c97611c1

drivers/usb/serial/console.c

+66 −61
Original line number Diff line number Diff line
@@ -211,7 +211,8 @@ static int usb_console_setup(struct console *co, char *options) 
goto out;

}



static void usb_console_write(struct console *co, const char *buf, unsigned count)

static void usb_console_write(struct console *co,

					const char *buf, unsigned count)

{

	static struct usbcons_info *info = &usbcons_info;

	struct usb_serial_port *port = info->port;
@@ -243,7 +244,8 @@ static void usb_console_write(struct console *co, const char *buf, unsigned coun 
				break;

			}

		}

		/* pass on to the driver specific version of this function if it is available */

		/* pass on to the driver specific version of this function if

		   it is available */

		if (serial->type->write)

			retval = serial->type->write(NULL, port, buf, i);

		else
@@ -253,9 +255,11 @@ static void usb_console_write(struct console *co, const char *buf, unsigned coun 
			/* append CR after LF */

			unsigned char cr = 13;

			if (serial->type->write)

				retval = serial->type->write(NULL, port, &cr, 1);

				retval = serial->type->write(NULL,

								port, &cr, 1);

			else

				retval = usb_serial_generic_write(NULL, port, &cr, 1);

				retval = usb_serial_generic_write(NULL,

								port, &cr, 1);

			dbg("%s - return value : %d", __func__, retval);

		}

		buf += i;
@@ -273,7 +277,8 @@ static struct console usbcons = { 


void usb_serial_console_disconnect(struct usb_serial *serial)

{

	if (serial && serial->port && serial->port[0] && serial->port[0] == usbcons_info.port) {

	if (serial && serial->port && serial->port[0]

				&& serial->port[0] == usbcons_info.port) {

		usb_serial_console_exit();

		usb_serial_put(serial);

	}
@@ -293,9 +298,9 @@ void usb_serial_console_init (int serial_debug, int minor) 
		/*

		 * Register console.

		 * NOTES:

		 * console_setup() is called (back) immediately (from register_console).

		 * console_write() is called immediately from register_console iff

		 * CON_PRINTBUFFER is set in flags.

		 * console_setup() is called (back) immediately (from

		 * register_console). console_write() is called immediately

		 * from register_console iff CON_PRINTBUFFER is set in flags.

		 */

		dbg("registering the USB serial console.");

		register_console(&usbcons);