staging: ft1000: Fix coding style in get_request_type() function.
authorMarek Belisko <marek.belisko@open-nandra.com>
Thu, 3 Feb 2011 10:07:44 +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 18364c2c87ca1505d910755372add19cf930a5f3..ddd4e12279d3c7e2ff9b5de9414eaa4d90be5a1a 100644 (file)
@@ -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)