lkml.org 
[lkml]   [2011]   [Jan]   [25]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v2 08/11] staging: ft1000: Fix coding style in get_request_value() function.
    Date
    Signed-off-by: Marek Belisko <marek.belisko@open-nandra.com>
    ---
    .../staging/ft1000/ft1000-usb/ft1000_download.c | 38 +++++++++-----------
    1 files changed, 17 insertions(+), 21 deletions(-)

    diff --git a/drivers/staging/ft1000/ft1000-usb/ft1000_download.c b/drivers/staging/ft1000/ft1000-usb/ft1000_download.c
    index 3385eac..b34429c 100644
    --- a/drivers/staging/ft1000/ft1000-usb/ft1000_download.c
    +++ b/drivers/staging/ft1000/ft1000-usb/ft1000_download.c
    @@ -406,30 +406,26 @@ static u16 get_request_type_usb(struct ft1000_device *ft1000dev)
    //---------------------------------------------------------------------------
    static long get_request_value(struct ft1000_device *ft1000dev)
    {
    - u32 value;
    - u16 tempword;
    - u32 status;
    + u32 value;
    + u16 tempword;
    + u32 status;
    struct ft1000_info *pft1000info = netdev_priv(ft1000dev->net);

    + if (pft1000info->bootmode == 1) {
    + status = fix_ft1000_read_dpram32(ft1000dev,
    + DWNLD_MAG1_SIZE_LOC, (u8 *)&value);
    + value = ntohl(value);
    + } else {
    + status = ft1000_read_dpram16(ft1000dev,
    + DWNLD_MAG1_SIZE_LOC, (u8 *)&tempword, 0);
    + value = tempword;
    + status = ft1000_read_dpram16(ft1000dev,
    + DWNLD_MAG1_SIZE_LOC, (u8 *)&tempword, 1);
    + value |= (tempword << 16);
    + value = ntohl(value);
    + }

    - if ( pft1000info->bootmode == 1)
    - {
    - status = fix_ft1000_read_dpram32(ft1000dev, DWNLD_MAG1_SIZE_LOC, (u8 *)&value);
    - value = ntohl(value);
    - }
    - else
    - {
    - status = ft1000_read_dpram16(ft1000dev, DWNLD_MAG1_SIZE_LOC, (u8 *)&tempword, 0);
    - value = tempword;
    - status = ft1000_read_dpram16(ft1000dev, DWNLD_MAG1_SIZE_LOC, (u8 *)&tempword, 1);
    - value |= (tempword << 16);
    - value = ntohl(value);
    - }
    -
    -
    - //DEBUG("get_request_value: value is %x\n", value);
    - return value;
    -
    + return value;
    }


    --
    1.7.1


    \
     
     \ /
      Last update: 2011-01-25 14:09    [W:0.026 / U:92.232 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site