Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755657AbbBPM57 (ORCPT ); Mon, 16 Feb 2015 07:57:59 -0500 Received: from mail-pa0-f42.google.com ([209.85.220.42]:50498 "EHLO mail-pa0-f42.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755183AbbBPM55 (ORCPT ); Mon, 16 Feb 2015 07:57:57 -0500 X-Google-Original-Sender: Date: Mon, 16 Feb 2015 19:59:45 +0700 From: Johan Hovold To: Peter Hung Cc: johan@kernel.org, gregkh@linuxfoundation.org, linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org, tom_tsai@fintek.com.tw, peter_hong@fintek.com.tw, Peter Hung Subject: Re: [PATCH V5 3/8] USB: f81232: implement RX bulk-in ep Message-ID: <20150216125945.GM2551@localhost> References: <1423216014-571-1-git-send-email-hpeter+linux_kernel@gmail.com> <1423216014-571-4-git-send-email-hpeter+linux_kernel@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1423216014-571-4-git-send-email-hpeter+linux_kernel@gmail.com> User-Agent: Mutt/1.5.22 (2013-10-16) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 4017 Lines: 128 On Fri, Feb 06, 2015 at 05:46:49PM +0800, Peter Hung wrote: > The F81232 bulk-in is RX data + LSR channel, data format is > [LSR+Data][LSR+Data]..... , We had reimplemented in this patch. > > Signed-off-by: Peter Hung > --- > drivers/usb/serial/f81232.c | 68 +++++++++++++++++++++++---------------------- > 1 file changed, 35 insertions(+), 33 deletions(-) > > diff --git a/drivers/usb/serial/f81232.c b/drivers/usb/serial/f81232.c > index ec4609d..9ea498a 100644 > --- a/drivers/usb/serial/f81232.c > +++ b/drivers/usb/serial/f81232.c > @@ -185,44 +185,46 @@ exit: > 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 = TTY_NORMAL; > - unsigned long flags; > - u8 line_status; > + char tty_flag; > int i; > > - /* update line status */ > - spin_lock_irqsave(&priv->lock, flags); > - line_status = priv->modem_status; > - priv->modem_status &= ~UART_STATE_TRANSIENT_MASK; > - spin_unlock_irqrestore(&priv->lock, flags); > - > - if (!urb->actual_length) > + if (urb->actual_length < 2) > return; > > - /* break takes precedence over parity, */ > - /* which takes precedence over framing errors */ > - if (line_status & UART_BREAK_ERROR) > - tty_flag = TTY_BREAK; > - else if (line_status & UART_PARITY_ERROR) > - tty_flag = TTY_PARITY; > - else if (line_status & UART_FRAME_ERROR) > - tty_flag = TTY_FRAME; > - dev_dbg(&port->dev, "%s - tty_flag = %d\n", __func__, tty_flag); > - > - /* overrun is special, not associated with a char */ > - if (line_status & UART_OVERRUN_ERROR) > - tty_insert_flip_char(&port->port, 0, TTY_OVERRUN); > - > - if (port->port.console && port->sysrq) { > - for (i = 0; i < urb->actual_length; ++i) > - if (!usb_serial_handle_sysrq_char(port, data[i])) > - tty_insert_flip_char(&port->port, data[i], > - tty_flag); > - } else { > - tty_insert_flip_string_fixed_flag(&port->port, data, tty_flag, > - urb->actual_length); > + /* bulk-in data: [LSR(1Byte)+DATA(1Byte)][LSR(1Byte)+DATA(1Byte)]... */ > + > + for (i = 0 ; i < urb->actual_length ; i += 2) { No space after ;. > + tty_flag = TTY_NORMAL; > + > + if (unlikely(data[i+0] & UART_LSR_BRK_ERROR_BITS)) { Always use spaces around binary operators such as +, but in this case I think it would be preferable to introduce a temporary variable u8 lsr, which you update at the beginning of the loop construct. > + if (data[i+0] & UART_LSR_BI) { > + tty_flag = TTY_BREAK; > + port->icount.brk++; > + usb_serial_handle_break(port); > + } else if (data[i+0] & UART_LSR_PE) { > + tty_flag = TTY_PARITY; > + port->icount.parity++; > + } else if (data[i+0] & UART_LSR_FE) { > + tty_flag = TTY_FRAME; > + port->icount.frame++; > + } > + > + if (data[0] & UART_LSR_OE) { You probably want data[i] (lsr) here as well. > + port->icount.overrun++; > + tty_insert_flip_char(&port->port, 0, > + TTY_OVERRUN); > + } > + } > + > + if (port->port.console && port->sysrq) { > + if (!usb_serial_handle_sysrq_char(port, data[i+1])) Spaces around + again. > + tty_insert_flip_char(&port->port, data[i+1], > + tty_flag); > + } else { > + tty_insert_flip_string_fixed_flag(&port->port, > + &data[i+1], tty_flag, 1); > + } Use tty_insert_flip_char in both branches. In fact, you could rewrite this as: if (port->port.console && port->sysrq) { if (usb_serial_handle_sysrq_char(port, data[i + 1])) continue; } tty_insert_flip_char(&port->port, data[i + 1], tty_flag); > } > > tty_flip_buffer_push(&port->port); I'll try to look at the rest of the series soon. Johan -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/