staging: ft1000: Fix coding style in get_request_value() function.
authorMarek Belisko <marek.belisko@open-nandra.com>
Thu, 3 Feb 2011 10:07:46 +0000 (11:07 +0100)
committerGreg Kroah-Hartman <gregkh@suse.de>
Fri, 4 Feb 2011 20:43:41 +0000 (12:43 -0800)
Signed-off-by: Marek Belisko <marek.belisko@open-nandra.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
drivers/staging/ft1000/ft1000-usb/ft1000_download.c

index 7496ad8732a698e83c623578f4675274964a7d44..223c0471ccc292e1ec8c6b9bf2a71134131d6b30 100644 (file)
@@ -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;
 }