lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

tty-usb-console: tidy the USB console code

Browse Source 
Code tidy

Signed-off-by: Alan Cox <alan@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Alan Cox
2008-07-22 11:09:57 +01:00
committed by Linus Torvalds
parent c97611c16d
commit 4dbd5a0961
1 changed files with 66 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
drivers/usb/serial/console.c
View File

@@ -211,7 +211,8 @@ reset_open_count:
goto out; 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; static struct usbcons_info *info = &usbcons_info;
struct usb_serial_port *port = info->port; 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; 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) if (serial->type->write)
retval = serial->type->write(NULL, port, buf, i); retval = serial->type->write(NULL, port, buf, i);
else else
@@ -253,9 +255,11 @@ static void usb_console_write(struct console *co, const char *buf, unsigned coun
/* append CR after LF */ /* append CR after LF */
unsigned char cr = 13; unsigned char cr = 13;
if (serial->type->write) if (serial->type->write)
retval = serial->type->write(NULL, port, &cr, 1); retval = serial->type->write(NULL,
port, &cr, 1);
else 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); dbg("%s - return value : %d", __func__, retval);
} }
buf += i; buf += i;
@@ -273,7 +277,8 @@ static struct console usbcons = {
void usb_serial_console_disconnect(struct usb_serial *serial) 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_console_exit();
usb_serial_put(serial); usb_serial_put(serial);
} }
@@ -293,9 +298,9 @@ void usb_serial_console_init (int serial_debug, int minor)
/* /*
* Register console. * Register console.
* NOTES: * NOTES:
* console_setup() is called (back) immediately (from register_console). * console_setup() is called (back) immediately (from
* console_write() is called immediately from register_console iff * register_console). console_write() is called immediately
* CON_PRINTBUFFER is set in flags. * from register_console iff CON_PRINTBUFFER is set in flags.
*/ */
dbg("registering the USB serial console."); dbg("registering the USB serial console.");
register_console(&usbcons); register_console(&usbcons);