diff options
| author | Marek Belisko <marek.belisko@open-nandra.com> | 2011-02-03 11:07:44 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-02-04 12:43:41 -0800 |
| commit | 9b43f374686a285f023bc3dbc574c09e6e506f64 (patch) | |
| tree | 8b9967564e91db0064f688d28bfdae0ecd599444 /drivers/staging/ft1000/ft1000-usb/ft1000_download.c | |
| parent | 5acc5396af600d0830b4a162b65f8540e5ed17f4 (diff) | |
| download | kernel_samsung_smdk4412-9b43f374686a285f023bc3dbc574c09e6e506f64.zip kernel_samsung_smdk4412-9b43f374686a285f023bc3dbc574c09e6e506f64.tar.gz kernel_samsung_smdk4412-9b43f374686a285f023bc3dbc574c09e6e506f64.tar.bz2 | |
staging: ft1000: Fix coding style in get_request_type() function.
Signed-off-by: Marek Belisko <marek.belisko@open-nandra.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/ft1000/ft1000-usb/ft1000_download.c')
| -rw-r--r-- | drivers/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 18364c2..ddd4e12 100644 --- a/drivers/staging/ft1000/ft1000-usb/ft1000_download.c +++ b/drivers/staging/ft1000/ft1000-usb/ft1000_download.c @@ -340,30 +340,26 @@ static void put_handshake_usb(struct ft1000_device *ft1000dev,u16 handshake_valu //--------------------------------------------------------------------------- static u16 get_request_type(struct ft1000_device *ft1000dev) { - u16 request_type; - u32 status; - u16 tempword; - u32 tempx; + u16 request_type; + u32 status; + u16 tempword; + u32 tempx; struct ft1000_info *pft1000info = netdev_priv(ft1000dev->net); - if ( pft1000info->bootmode == 1) - { - status = fix_ft1000_read_dpram32 (ft1000dev, DWNLD_MAG1_TYPE_LOC, (u8 *)&tempx); - tempx = ntohl(tempx); - } - else - { - tempx = 0; - - status = ft1000_read_dpram16 (ft1000dev, DWNLD_MAG1_TYPE_LOC, (u8 *)&tempword, 1); - tempx |= (tempword << 16); - tempx = ntohl(tempx); - } - request_type = (u16)tempx; - - //DEBUG("get_request_type: request_type is %x\n", request_type); - return request_type; + if (pft1000info->bootmode == 1) { + status = fix_ft1000_read_dpram32(ft1000dev, + DWNLD_MAG1_TYPE_LOC, (u8 *)&tempx); + tempx = ntohl(tempx); + } else { + tempx = 0; + status = ft1000_read_dpram16(ft1000dev, + DWNLD_MAG1_TYPE_LOC, (u8 *)&tempword, 1); + tempx |= (tempword << 16); + tempx = ntohl(tempx); + } + request_type = (u16)tempx; + return request_type; } static u16 get_request_type_usb(struct ft1000_device *ft1000dev) |