lkml.org 
[lkml]   [2009]   [Oct]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[09/46] USB: ftdi_sio: clean up read completion handler
    2.6.31-stable review patch.  If anyone has any objections, please let us know.

    ------------------
    From: Johan Hovold <jhovold@gmail.com>

    commit e63e278b4d2d867893962d3c7cd13a3a24ceb3f1 upstream.

    Remove superfluous error checks in completion handler:

    - No need to check private data and urb pointers as we check urb-status
    before dereferencing priv (which is not freed until urb has been killed
    on close).
    - No need to check tty as it is checked again when processing.
    - No need to check urb->number_of_packets on bulk urb.

    Note that both private data and tty are checked again before processing
    (possibly from work queue which also is cancelled on close).

    Signed-off-by: Johan Hovold <jhovold@gmail.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

    ---
    drivers/usb/serial/ftdi_sio.c | 28 +---------------------------
    1 file changed, 1 insertion(+), 27 deletions(-)

    --- a/drivers/usb/serial/ftdi_sio.c
    +++ b/drivers/usb/serial/ftdi_sio.c
    @@ -2010,39 +2010,14 @@ static int ftdi_chars_in_buffer(struct t
    static void ftdi_read_bulk_callback(struct urb *urb)
    {
    struct usb_serial_port *port = urb->context;
    - struct tty_struct *tty;
    struct ftdi_private *priv;
    int status = urb->status;

    - if (urb->number_of_packets > 0) {
    - dev_err(&port->dev, "%s transfer_buffer_length %d "
    - "actual_length %d number of packets %d\n", __func__,
    - urb->transfer_buffer_length,
    - urb->actual_length, urb->number_of_packets);
    - dev_err(&port->dev, "%s transfer_flags %x\n", __func__,
    - urb->transfer_flags);
    - }
    -
    dbg("%s - port %d", __func__, port->number);

    if (port->port.count <= 0)
    return;

    - tty = tty_port_tty_get(&port->port);
    - if (!tty) {
    - dbg("%s - bad tty pointer - exiting", __func__);
    - return;
    - }
    -
    - priv = usb_get_serial_port_data(port);
    - if (!priv) {
    - dbg("%s - bad port private data pointer - exiting", __func__);
    - goto out;
    - }
    -
    - if (urb != port->read_urb)
    - dev_err(&port->dev, "%s - Not my urb!\n", __func__);
    -
    if (status) {
    /* This will happen at close every time so it is a dbg not an
    err */
    @@ -2050,9 +2025,8 @@ static void ftdi_read_bulk_callback(stru
    goto out;
    }

    + priv = usb_get_serial_port_data(port);
    ftdi_process_read(&priv->rx_work.work);
    -out:
    - tty_kref_put(tty);
    } /* ftdi_read_bulk_callback */





    \
     
     \ /
      Last update: 2009-10-16 19:35    [W:4.334 / U:2.660 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site