USB: serial: f81232: extract LSR handler

Extract LSR handler to function that can be re-used by
F81532A/534A/535/536.

Signed-off-by: Ji-Ze Hong (Peter Hong) <hpeter+linux_kernel@gmail.com>
Signed-off-by: Johan Hovold <johan@kernel.org>

diff --git a/drivers/usb/serial/f81232.c b/drivers/usb/serial/f81232.c
index 43fa1f0716b7d759d113ffe9b951f85369b98c50..c07d376c743daeb9c19f9ff4023a7852e2d947ad 100644 (file)
--- a/drivers/usb/serial/f81232.c
+++ b/drivers/usb/serial/f81232.c
@@ -322,10 +322,38 @@ exit:
                        __func__, retval);
 }
 
+static char f81232_handle_lsr(struct usb_serial_port *port, u8 lsr)
+{
+       struct f81232_private *priv = usb_get_serial_port_data(port);
+       char tty_flag = TTY_NORMAL;
+
+       if (!(lsr & UART_LSR_BRK_ERROR_BITS))
+               return tty_flag;
+
+       if (lsr & UART_LSR_BI) {
+               tty_flag = TTY_BREAK;
+               port->icount.brk++;
+               usb_serial_handle_break(port);
+       } else if (lsr & UART_LSR_PE) {
+               tty_flag = TTY_PARITY;
+               port->icount.parity++;
+       } else if (lsr & UART_LSR_FE) {
+               tty_flag = TTY_FRAME;
+               port->icount.frame++;
+       }
+
+       if (lsr & UART_LSR_OE) {
+               port->icount.overrun++;
+               schedule_work(&priv->lsr_work);
+               tty_insert_flip_char(&port->port, 0, TTY_OVERRUN);
+       }
+
+       return tty_flag;
+}
+
 static void f81232_process_read_urb(struct urb *urb)
 {
        struct usb_serial_port *port = urb->context;
-       struct f81232_private *priv = usb_get_serial_port_data(port);
        unsigned char *data = urb->transfer_buffer;
        char tty_flag;
        unsigned int i;
@@ -341,29 +369,8 @@ static void f81232_process_read_urb(struct urb *urb)
        /* bulk-in data: [LSR(1Byte)+DATA(1Byte)][LSR(1Byte)+DATA(1Byte)]... */
 
        for (i = 0; i < urb->actual_length; i += 2) {
-               tty_flag = TTY_NORMAL;
                lsr = data[i];
-
-               if (lsr & UART_LSR_BRK_ERROR_BITS) {
-                       if (lsr & UART_LSR_BI) {
-                               tty_flag = TTY_BREAK;
-                               port->icount.brk++;
-                               usb_serial_handle_break(port);
-                       } else if (lsr & UART_LSR_PE) {
-                               tty_flag = TTY_PARITY;
-                               port->icount.parity++;
-                       } else if (lsr & UART_LSR_FE) {
-                               tty_flag = TTY_FRAME;
-                               port->icount.frame++;
-                       }
-
-                       if (lsr & UART_LSR_OE) {
-                               port->icount.overrun++;
-                               schedule_work(&priv->lsr_work);
-                               tty_insert_flip_char(&port->port, 0,
-                                               TTY_OVERRUN);
-                       }
-               }
+               tty_flag = f81232_handle_lsr(port, lsr);
 
                if (port->port.console && port->sysrq) {
                        if (usb_serial_handle_sysrq_char(port, data[i + 1]))