staging: ft1000: Fix coding style in get_handshake_usb() function.
authorMarek Belisko <marek.belisko@open-nandra.com>
Thu, 3 Feb 2011 10:07:42 +0000 (11:07 +0100)
committerGreg Kroah-Hartman <gregkh@suse.de>
Fri, 4 Feb 2011 20:43:40 +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 14729432d1df6159675760adbf65ab30e1d54f0d..c22ce5401671ba58648782229d301576cf345a3a 100644 (file)
@@ -273,42 +273,50 @@ static void put_handshake(struct ft1000_device *ft1000dev,u16 handshake_value)
 
 static u16 get_handshake_usb(struct ft1000_device *ft1000dev, u16 expected_value)
 {
-   u16            handshake;
-   int               loopcnt;
-   u16            temp;
-   u32             status=0;
+       u16 handshake;
+       int loopcnt;
+       u16 temp;
+       u32 status = 0;
 
        struct ft1000_info *pft1000info = netdev_priv(ft1000dev->net);
-   loopcnt = 0;
-   handshake = 0;
-   while (loopcnt < 100)
-   {
-       if (pft1000info->usbboot == 2) {
-           status = ft1000_read_dpram32 (ft1000dev, 0, (u8 *)&(pft1000info->tempbuf[0]), 64);
-           for (temp=0; temp<16; temp++)
-               DEBUG("tempbuf %d = 0x%x\n", temp, pft1000info->tempbuf[temp]);
-           status = ft1000_read_dpram16 (ft1000dev, DWNLD_MAG1_HANDSHAKE_LOC, (u8 *)&handshake, 1);
-           DEBUG("handshake from read_dpram16 = 0x%x\n", handshake);
-           if (pft1000info->dspalive == pft1000info->tempbuf[6])
-               handshake = 0;
-           else {
-               handshake = pft1000info->tempbuf[1];
-               pft1000info->dspalive = pft1000info->tempbuf[6];
-           }
-       }
-       else {
-           status = ft1000_read_dpram16 (ft1000dev, DWNLD_MAG1_HANDSHAKE_LOC, (u8 *)&handshake, 1);
-       }
-       loopcnt++;
-       msleep(10);
-       handshake = ntohs(handshake);
-       if ((handshake == expected_value) || (handshake == HANDSHAKE_RESET_VALUE_USB))
-       {
-           return handshake;
-       }
-   }
+       loopcnt = 0;
+       handshake = 0;
+
+       while (loopcnt < 100) {
+               if (pft1000info->usbboot == 2) {
+                       status = ft1000_read_dpram32(ft1000dev, 0,
+                                       (u8 *)&(pft1000info->tempbuf[0]), 64);
+                       for (temp = 0; temp < 16; temp++) {
+                               DEBUG("tempbuf %d = 0x%x\n", temp,
+                                       pft1000info->tempbuf[temp]);
+                       }
+                       status = ft1000_read_dpram16(ft1000dev,
+                                               DWNLD_MAG1_HANDSHAKE_LOC,
+                                               (u8 *)&handshake, 1);
+                       DEBUG("handshake from read_dpram16 = 0x%x\n",
+                               handshake);
+                       if (pft1000info->dspalive == pft1000info->tempbuf[6]) {
+                               handshake = 0;
+                       } else {
+                               handshake = pft1000info->tempbuf[1];
+                               pft1000info->dspalive =
+                                               pft1000info->tempbuf[6];
+                       }
+               } else {
+                       status = ft1000_read_dpram16(ft1000dev,
+                                               DWNLD_MAG1_HANDSHAKE_LOC,
+                                               (u8 *)&handshake, 1);
+               }
 
-   return HANDSHAKE_TIMEOUT_VALUE;
+               loopcnt++;
+               msleep(10);
+               handshake = ntohs(handshake);
+               if ((handshake == expected_value) ||
+                   (handshake == HANDSHAKE_RESET_VALUE_USB))
+                       return handshake;
+       }
+
+       return HANDSHAKE_TIMEOUT_VALUE;
 }
 
 static void put_handshake_usb(struct ft1000_device *ft1000dev,u16 handshake_value)