Merge tag 'tty-3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty

[pandora-kernel.git] / drivers / staging / serqt_usb2 / serqt_usb2.c

diff --git a/drivers/staging/serqt_usb2/serqt_usb2.c b/drivers/staging/serqt_usb2/serqt_usb2.c
index c90de96..5c969ad 100644 (file)
--- a/drivers/staging/serqt_usb2/serqt_usb2.c
+++ b/drivers/staging/serqt_usb2/serqt_usb2.c
@@ -247,7 +247,6 @@ static void ProcessLineStatus(struct quatech_port *qt_port,
        qt_port->shadowLSR =
            line_status & (SERIAL_LSR_OE | SERIAL_LSR_PE | SERIAL_LSR_FE |
                           SERIAL_LSR_BI);
-       return;
 }
 
 static void ProcessModemStatus(struct quatech_port *qt_port,
@@ -256,7 +255,6 @@ static void ProcessModemStatus(struct quatech_port *qt_port,
 
        qt_port->shadowMSR = modem_status;
        wake_up_interruptible(&qt_port->wait);
-       return;
 }
 
 static void ProcessRxChar(struct tty_struct *tty, struct usb_serial_port *port,
@@ -704,7 +702,7 @@ static int qt_startup(struct usb_serial *serial)
                port = serial->port[i];
                qt_port = kzalloc(sizeof(*qt_port), GFP_KERNEL);
                if (!qt_port) {
-                       dbg("%s: kmalloc for quatech_port (%d) failed!.",
+                       dbg("%s: kzalloc for quatech_port (%d) failed!.",
                            __func__, i);
                        for (--i; i >= 0; i--) {
                                port = serial->port[i];
@@ -1410,7 +1408,7 @@ static int qt_tiocmget(struct tty_struct *tty)
        struct usb_serial_port *port = tty->driver_data;
        struct usb_serial *serial = get_usb_serial(port, __func__);
        struct quatech_port *qt_port = qt_get_port_private(port);
-       int retval = -ENODEV;
+       int retval;
 
        if (!serial)
                return -ENODEV;
@@ -1428,7 +1426,7 @@ static int qt_tiocmset(struct tty_struct *tty,
        struct usb_serial_port *port = tty->driver_data;
        struct usb_serial *serial = get_usb_serial(port, __func__);
        struct quatech_port *qt_port = qt_get_port_private(port);
-       int retval = -ENODEV;
+       int retval;
 
        if (!serial)
                return -ENODEV;
@@ -1456,7 +1454,6 @@ static void qt_throttle(struct tty_struct *tty)
        qt_port->RxHolding = 1;
 
        mutex_unlock(&qt_port->lock);
-       return;
 }
 
 static void qt_unthrottle(struct tty_struct *tty)
@@ -1497,8 +1494,6 @@ static void qt_unthrottle(struct tty_struct *tty)
                }
        }
        mutex_unlock(&qt_port->lock);
-       return;
-
 }
 
 static int qt_calc_num_ports(struct usb_serial *serial)