hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

USB: console: remove unnecessary operations test 

Remove unnecessary tests for open and write operations as these are set
to the generic implementations by usb-serial core if left unset by a
subdriver.

Signed-off-by: Johan Hovold <jhovold@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Johan Hovold 2013-06-26 16:47:26 +02:00 committed by Greg Kroah-Hartman
parent 7b94cae47c
commit c7b13475b4
1 changed files with 3 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -151,11 +151,7 @@ static int usb_console_setup(struct console *co, char *options)
/* only call the device specific open if this /* only call the device specific open if this
* is the first time the port is opened */ * is the first time the port is opened */
if (serial->type->open)
retval = serial->type->open(NULL, port); retval = serial->type->open(NULL, port);
else
retval = usb_serial_generic_open(NULL, port);
if (retval) { if (retval) {
dev_err(&port->dev, "could not open USB console port\n"); dev_err(&port->dev, "could not open USB console port\n");
goto fail; goto fail;
@ -230,20 +226,12 @@ static void usb_console_write(struct console *co,
} }
/* pass on to the driver specific version of this function if /* pass on to the driver specific version of this function if
it is available */ it is available */
if (serial->type->write)
retval = serial->type->write(NULL, port, buf, i); retval = serial->type->write(NULL, port, buf, i);
else
retval = usb_serial_generic_write(NULL, port, buf, i);
dev_dbg(&port->dev, "%s - write: %d\n", __func__, retval); dev_dbg(&port->dev, "%s - write: %d\n", __func__, retval);
if (lf) { if (lf) {
/* append CR after LF */ /* append CR after LF */
unsigned char cr = 13; 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);
dev_dbg(&port->dev, "%s - write cr: %d\n", dev_dbg(&port->dev, "%s - write cr: %d\n",
__func__, retval); __func__, retval);
} }