Commit 9b43f374 authored by Marek Belisko's avatar Marek Belisko Committed by Greg Kroah-Hartman

staging: ft1000: Fix coding style in get_request_type() function.

Signed-off-by: default avatarMarek Belisko <marek.belisko@open-nandra.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 5acc5396
...@@ -340,30 +340,26 @@ static void put_handshake_usb(struct ft1000_device *ft1000dev,u16 handshake_valu ...@@ -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) static u16 get_request_type(struct ft1000_device *ft1000dev)
{ {
u16 request_type; u16 request_type;
u32 status; u32 status;
u16 tempword; u16 tempword;
u32 tempx; u32 tempx;
struct ft1000_info *pft1000info = netdev_priv(ft1000dev->net); struct ft1000_info *pft1000info = netdev_priv(ft1000dev->net);
if ( pft1000info->bootmode == 1) if (pft1000info->bootmode == 1) {
{ status = fix_ft1000_read_dpram32(ft1000dev,
status = fix_ft1000_read_dpram32 (ft1000dev, DWNLD_MAG1_TYPE_LOC, (u8 *)&tempx); DWNLD_MAG1_TYPE_LOC, (u8 *)&tempx);
tempx = ntohl(tempx); tempx = ntohl(tempx);
} } else {
else tempx = 0;
{ status = ft1000_read_dpram16(ft1000dev,
tempx = 0; DWNLD_MAG1_TYPE_LOC, (u8 *)&tempword, 1);
tempx |= (tempword << 16);
status = ft1000_read_dpram16 (ft1000dev, DWNLD_MAG1_TYPE_LOC, (u8 *)&tempword, 1); tempx = ntohl(tempx);
tempx |= (tempword << 16); }
tempx = ntohl(tempx); request_type = (u16)tempx;
}
request_type = (u16)tempx;
//DEBUG("get_request_type: request_type is %x\n", request_type);
return request_type;
return request_type;
} }
static u16 get_request_type_usb(struct ft1000_device *ft1000dev) static u16 get_request_type_usb(struct ft1000_device *ft1000dev)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment