Commit 1afd37c6 authored by Ji-Ze Hong (Peter Hong)'s avatar Ji-Ze Hong (Peter Hong) Committed by Johan Hovold
Browse files

USB: serial: f81232: extract LSR handler 



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

Signed-off-by: default avatarJi-Ze Hong (Peter Hong) <hpeter+linux_kernel@gmail.com>
Signed-off-by: default avatarJohan Hovold <johan@kernel.org>
parent 2c0bee08

drivers/usb/serial/f81232.c

+30 −23
Original line number Diff line number Diff line
@@ -322,29 +322,14 @@ static void f81232_read_int_callback(struct urb *urb) 
			__func__, retval);

}



static void f81232_process_read_urb(struct urb *urb)

static char f81232_handle_lsr(struct usb_serial_port *port, u8 lsr)

{

	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;

	u8 lsr;

	char tty_flag = TTY_NORMAL;



	/*

	 * When opening the port we get a 1-byte packet with the current LSR,

	 * which we discard.

	 */

	if ((urb->actual_length < 2) || (urb->actual_length % 2))

		return;

	if (!(lsr & UART_LSR_BRK_ERROR_BITS))

		return tty_flag;



	/* 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++;
@@ -360,11 +345,33 @@ static void f81232_process_read_urb(struct urb *urb) 
	if (lsr & UART_LSR_OE) {

		port->icount.overrun++;

		schedule_work(&priv->lsr_work);

				tty_insert_flip_char(&port->port, 0,

						TTY_OVERRUN);

		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;

	unsigned char *data = urb->transfer_buffer;

	char tty_flag;

	unsigned int i;

	u8 lsr;



	/*

	 * When opening the port we get a 1-byte packet with the current LSR,

	 * which we discard.

	 */

	if ((urb->actual_length < 2) || (urb->actual_length % 2))

		return;



	/* bulk-in data: [LSR(1Byte)+DATA(1Byte)][LSR(1Byte)+DATA(1Byte)]... */



	for (i = 0; i < urb->actual_length; i += 2) {

		lsr = data[i];

		tty_flag = f81232_handle_lsr(port, lsr);



		if (port->port.console && port->sysrq) {

			if (usb_serial_handle_sysrq_char(port, data[i + 1]))

				continue;