lkml.org 
[lkml]   [2011]   [Feb]   [9]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 1/9] staging: ft1000: Fix coding style in ft1000_control function.
    Date
    Signed-off-by: Marek Belisko <marek.belisko@open-nandra.com>
    ---
    drivers/staging/ft1000/ft1000-usb/ft1000_hw.c | 43 +++++++------------------
    1 files changed, 12 insertions(+), 31 deletions(-)

    diff --git a/drivers/staging/ft1000/ft1000-usb/ft1000_hw.c b/drivers/staging/ft1000/ft1000-usb/ft1000_hw.c
    index 643a637..bb28a2b 100644
    --- a/drivers/staging/ft1000/ft1000-usb/ft1000_hw.c
    +++ b/drivers/staging/ft1000/ft1000-usb/ft1000_hw.c
    @@ -65,45 +65,26 @@ static u8 tempbuffer[1600];
    // Notes:
    //
    //---------------------------------------------------------------------------
    -static int ft1000_control(struct ft1000_device *ft1000dev,unsigned int pipe,
    - u8 request,
    - u8 requesttype,
    - u16 value,
    - u16 index,
    - void *data,
    - u16 size,
    - int timeout)
    +static int ft1000_control(struct ft1000_device *ft1000dev, unsigned int pipe,
    + u8 request, u8 requesttype, u16 value, u16 index,
    + void *data, u16 size, int timeout)
    {
    u16 ret;

    - if (ft1000dev == NULL )
    - {
    - DEBUG("NULL ft1000dev, failure\n");
    - return -ENODEV;
    - }
    - else if ( ft1000dev->dev == NULL )
    - {
    - DEBUG("NULL ft1000dev->dev, failure\n");
    - return -ENODEV;
    - }
    + if ((ft1000dev == NULL) || (ft1000dev->dev == NULL)) {
    + DEBUG("ft1000dev or ft1000dev->dev == NULL, failure\n");
    + return -ENODEV;
    + }

    - ret = usb_control_msg(ft1000dev->dev,
    - pipe,
    - request,
    - requesttype,
    - value,
    - index,
    - data,
    - size,
    - LARGE_TIMEOUT);
    + ret = usb_control_msg(ft1000dev->dev, pipe, request, requesttype,
    + value, index, data, size, LARGE_TIMEOUT);

    if (ret > 0)
    ret = 0;

    - return ret;
    -
    -
    + return ret;
    }
    +
    //---------------------------------------------------------------------------
    // Function: ft1000_read_register
    //
    --
    1.7.1


    \
     
     \ /
      Last update: 2011-02-09 15:05    [W:0.023 / U:0.176 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site