diff options
| author | Johan Hovold | 2013-06-26 16:47:26 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2013-07-24 01:24:32 +0200 |
| commit | c7b13475b4466adcdcd8378f12b4ee416ef9b98b (patch) | |
| tree | 5c02f98f19dd07c7613a74fb14dc4f37994e719f /drivers/usb/serial/console.c | |
| parent | USB: console: use dev_dbg (diff) | |
| download | kernel-qcow2-linux-c7b13475b4466adcdcd8378f12b4ee416ef9b98b.tar.gz kernel-qcow2-linux-c7b13475b4466adcdcd8378f12b4ee416ef9b98b.tar.xz kernel-qcow2-linux-c7b13475b4466adcdcd8378f12b4ee416ef9b98b.zip | |
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>
Diffstat (limited to 'drivers/usb/serial/console.c')
| -rw-r--r-- | drivers/usb/serial/console.c | 18 |
1 files changed, 3 insertions, 15 deletions
diff --git a/drivers/usb/serial/console.c b/drivers/usb/serial/console.c index bfad2cd39bf3..c69bb50d4663 100644 --- a/drivers/usb/serial/console.c +++ b/drivers/usb/serial/console.c @@ -151,11 +151,7 @@ static int usb_console_setup(struct console *co, char *options) /* only call the device specific open if this * is the first time the port is opened */ - if (serial->type->open) - retval = serial->type->open(NULL, port); - else - retval = usb_serial_generic_open(NULL, port); - + retval = serial->type->open(NULL, port); if (retval) { dev_err(&port->dev, "could not open USB console port\n"); 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 it is available */ - if (serial->type->write) - retval = serial->type->write(NULL, port, buf, i); - else - retval = usb_serial_generic_write(NULL, port, buf, i); + retval = serial->type->write(NULL, port, buf, i); dev_dbg(&port->dev, "%s - write: %d\n", __func__, retval); if (lf) { /* append CR after LF */ unsigned char cr = 13; - if (serial->type->write) - retval = serial->type->write(NULL, - port, &cr, 1); - else - retval = usb_serial_generic_write(NULL, - port, &cr, 1); + retval = serial->type->write(NULL, port, &cr, 1); dev_dbg(&port->dev, "%s - write cr: %d\n", __func__, retval); } |