aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/staging/ft1000
diff options
context:
space:
mode:
authorMarek Belisko <marek.belisko@open-nandra.com>2011-02-03 05:07:46 -0500
committerGreg Kroah-Hartman <gregkh@suse.de>2011-02-04 15:43:41 -0500
commit114a06ae848a1ca718f3e2ab077bddb15e576991 (patch)
treeb6a183de553de495084d62f5e9e0ffc5ebecc817 /drivers/staging/ft1000
parentc3ed5d2f25b89b67011f2883a141c5115eef415b (diff)
staging: ft1000: Fix coding style in get_request_value() 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')
-rw-r--r--drivers/staging/ft1000/ft1000-usb/ft1000_download.c38
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 7496ad8732a..223c0471ccc 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)
406//--------------------------------------------------------------------------- 406//---------------------------------------------------------------------------
407static long get_request_value(struct ft1000_device *ft1000dev) 407static long get_request_value(struct ft1000_device *ft1000dev)
408{ 408{
409 u32 value; 409 u32 value;
410 u16 tempword; 410 u16 tempword;
411 u32 status; 411 u32 status;
412 struct ft1000_info *pft1000info = netdev_priv(ft1000dev->net); 412 struct ft1000_info *pft1000info = netdev_priv(ft1000dev->net);
413 413
414 if (pft1000info->bootmode == 1) {
415 status = fix_ft1000_read_dpram32(ft1000dev,
416 DWNLD_MAG1_SIZE_LOC, (u8 *)&value);
417 value = ntohl(value);
418 } else {
419 status = ft1000_read_dpram16(ft1000dev,
420 DWNLD_MAG1_SIZE_LOC, (u8 *)&tempword, 0);
421 value = tempword;
422 status = ft1000_read_dpram16(ft1000dev,
423 DWNLD_MAG1_SIZE_LOC, (u8 *)&tempword, 1);
424 value |= (tempword << 16);
425 value = ntohl(value);
426 }
414 427
415 if ( pft1000info->bootmode == 1) 428 return value;
416 {
417 status = fix_ft1000_read_dpram32(ft1000dev, DWNLD_MAG1_SIZE_LOC, (u8 *)&value);
418 value = ntohl(value);
419 }
420 else
421 {
422 status = ft1000_read_dpram16(ft1000dev, DWNLD_MAG1_SIZE_LOC, (u8 *)&tempword, 0);
423 value = tempword;
424 status = ft1000_read_dpram16(ft1000dev, DWNLD_MAG1_SIZE_LOC, (u8 *)&tempword, 1);
425 value |= (tempword << 16);
426 value = ntohl(value);
427 }
428
429
430 //DEBUG("get_request_value: value is %x\n", value);
431 return value;
432
433} 429}
434 430
435 431