lkml.org 
[lkml]   [2011]   [Mar]   [8]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 14/21 v2] staging: ft1000: Fix coding style in ft1000_submit_rx_urb function.
    Date
    Fix coding style and also replace printk with proper pr_err
    function.

    Signed-off-by: Marek Belisko <marek.belisko@open-nandra.com>
    ---
    drivers/staging/ft1000/ft1000-usb/ft1000_hw.c | 46 ++++++++++++-------------
    1 files changed, 22 insertions(+), 24 deletions(-)

    diff --git a/drivers/staging/ft1000/ft1000-usb/ft1000_hw.c b/drivers/staging/ft1000/ft1000-usb/ft1000_hw.c
    index 8095dd2..8115e2c 100644
    --- a/drivers/staging/ft1000/ft1000-usb/ft1000_hw.c
    +++ b/drivers/staging/ft1000/ft1000-usb/ft1000_hw.c
    @@ -1203,38 +1203,36 @@ static int ft1000_copy_up_pkt (struct urb *urb)
    //---------------------------------------------------------------------------
    static int ft1000_submit_rx_urb(struct ft1000_info *info)
    {
    - int result;
    - struct ft1000_device *pFt1000Dev = info->pFt1000Dev;
    + int result;
    + struct ft1000_device *pFt1000Dev = info->pFt1000Dev;

    + //DEBUG ("ft1000_submit_rx_urb entered: sizeof rx_urb is %d\n", sizeof(*pFt1000Dev->rx_urb));
    + if (pFt1000Dev->status & FT1000_STATUS_CLOSING) {
    + DEBUG("network driver is closed, return\n");
    + //usb_kill_urb(pFt1000Dev->rx_urb); //mbelian
    + return -ENODEV;
    + }

    - //DEBUG ("ft1000_submit_rx_urb entered: sizeof rx_urb is %d\n", sizeof(*pFt1000Dev->rx_urb));
    - if ( pFt1000Dev->status & FT1000_STATUS_CLOSING)
    - {
    - DEBUG("network driver is closed, return\n");
    - //usb_kill_urb(pFt1000Dev->rx_urb); //mbelian
    - return -ENODEV;
    - }
    -
    - usb_fill_bulk_urb(pFt1000Dev->rx_urb,
    - pFt1000Dev->dev,
    - usb_rcvbulkpipe(pFt1000Dev->dev, pFt1000Dev->bulk_in_endpointAddr),
    - pFt1000Dev->rx_buf,
    - MAX_BUF_SIZE,
    - (usb_complete_t)ft1000_copy_up_pkt,
    - info);
    -
    + usb_fill_bulk_urb(pFt1000Dev->rx_urb,
    + pFt1000Dev->dev,
    + usb_rcvbulkpipe(pFt1000Dev->dev,
    + pFt1000Dev->bulk_in_endpointAddr),
    + pFt1000Dev->rx_buf, MAX_BUF_SIZE,
    + (usb_complete_t) ft1000_copy_up_pkt, info);

    - if((result = usb_submit_urb(pFt1000Dev->rx_urb, GFP_ATOMIC)))
    - {
    - printk("ft1000_submit_rx_urb: submitting rx_urb %d failed\n", result);
    - return result;
    - }
    + result = usb_submit_urb(pFt1000Dev->rx_urb, GFP_ATOMIC);

    - //DEBUG("ft1000_submit_rx_urb exit: result=%d\n", result);
    + if (result) {
    + pr_err("ft1000_submit_rx_urb: submitting rx_urb %d failed\n",
    + result);
    + return result;
    + }
    + //DEBUG("ft1000_submit_rx_urb exit: result=%d\n", result);

    return 0;
    }

    +
    //---------------------------------------------------------------------------
    // Function: ft1000_open
    //
    --
    1.7.1


    \
     
     \ /
      Last update: 2011-03-08 12:35    [W:4.135 / U:0.340 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site