Commit d7a7318b387ae4be24619fbac68ce5b5f5a7b7da
Committed by
Greg Kroah-Hartman
Greg Kroah-Hartman
1 parent
78395f672a
Exists in
master
and in
4 other branches
staging: ft1000: Fix coding style in get_handshake() function.
Signed-off-by: Marek Belisko <marek.belisko@open-nandra.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Showing 1 changed file with 37 additions and 45 deletions Side-by-side Diff
drivers/staging/ft1000/ft1000-usb/ft1000_download.c
| ... | ... | @@ -185,57 +185,49 @@ |
| 185 | 185 | //--------------------------------------------------------------------------- |
| 186 | 186 | static u16 get_handshake(struct ft1000_device *ft1000dev, u16 expected_value) |
| 187 | 187 | { |
| 188 | - u16 handshake; | |
| 189 | - int loopcnt; | |
| 190 | - u32 status=0; | |
| 188 | + u16 handshake; | |
| 189 | + int loopcnt; | |
| 190 | + u32 status = 0; | |
| 191 | 191 | struct ft1000_info *pft1000info = netdev_priv(ft1000dev->net); |
| 192 | 192 | |
| 193 | - loopcnt = 0; | |
| 194 | - while (loopcnt < 100) | |
| 195 | - { | |
| 193 | + loopcnt = 0; | |
| 196 | 194 | |
| 197 | - // Need to clear downloader doorbell if Hartley ASIC | |
| 198 | - status = ft1000_write_register (ft1000dev, FT1000_DB_DNLD_RX, FT1000_REG_DOORBELL); | |
| 199 | - //DEBUG("FT1000:get_handshake:doorbell = 0x%x\n", temp); | |
| 200 | - if (pft1000info->fcodeldr) | |
| 201 | - { | |
| 202 | - DEBUG(" get_handshake: fcodeldr is %d\n", pft1000info->fcodeldr); | |
| 203 | - pft1000info->fcodeldr = 0; | |
| 204 | - status = check_usb_db(ft1000dev); | |
| 205 | - if (status != STATUS_SUCCESS) | |
| 206 | - { | |
| 207 | - DEBUG("get_handshake: check_usb_db failed\n"); | |
| 208 | - status = STATUS_FAILURE; | |
| 209 | - break; | |
| 210 | - } | |
| 211 | - status = ft1000_write_register (ft1000dev, FT1000_DB_DNLD_RX, FT1000_REG_DOORBELL); | |
| 212 | - } | |
| 195 | + while (loopcnt < 100) { | |
| 196 | + /* Need to clear downloader doorbell if Hartley ASIC */ | |
| 197 | + status = ft1000_write_register(ft1000dev, FT1000_DB_DNLD_RX, | |
| 198 | + FT1000_REG_DOORBELL); | |
| 199 | + if (pft1000info->fcodeldr) { | |
| 200 | + DEBUG(" get_handshake: fcodeldr is %d\n", | |
| 201 | + pft1000info->fcodeldr); | |
| 202 | + pft1000info->fcodeldr = 0; | |
| 203 | + status = check_usb_db(ft1000dev); | |
| 204 | + if (status != STATUS_SUCCESS) { | |
| 205 | + DEBUG("get_handshake: check_usb_db failed\n"); | |
| 206 | + status = STATUS_FAILURE; | |
| 207 | + break; | |
| 208 | + } | |
| 209 | + status = ft1000_write_register(ft1000dev, | |
| 210 | + FT1000_DB_DNLD_RX, | |
| 211 | + FT1000_REG_DOORBELL); | |
| 212 | + } | |
| 213 | 213 | |
| 214 | - status = ft1000_read_dpram16 (ft1000dev, DWNLD_MAG1_HANDSHAKE_LOC, (u8 *)&handshake, 1); | |
| 215 | - //DEBUG("get_handshake: handshake is %x\n", tempx); | |
| 216 | - handshake = ntohs(handshake); | |
| 217 | - //DEBUG("get_handshake: after swap, handshake is %x\n", handshake); | |
| 214 | + status = ft1000_read_dpram16(ft1000dev, | |
| 215 | + DWNLD_MAG1_HANDSHAKE_LOC, (u8 *)&handshake, 1); | |
| 216 | + handshake = ntohs(handshake); | |
| 218 | 217 | |
| 219 | - if (status) | |
| 220 | - return HANDSHAKE_TIMEOUT_VALUE; | |
| 218 | + if (status) | |
| 219 | + return HANDSHAKE_TIMEOUT_VALUE; | |
| 221 | 220 | |
| 222 | - //DEBUG("get_handshake: handshake= %x\n", handshake); | |
| 223 | - if ((handshake == expected_value) || (handshake == HANDSHAKE_RESET_VALUE_USB)) | |
| 224 | - { | |
| 225 | - //DEBUG("get_handshake: return handshake %x\n", handshake); | |
| 226 | - return handshake; | |
| 227 | - } | |
| 228 | - else | |
| 229 | - { | |
| 230 | - loopcnt++; | |
| 231 | - msleep (10); | |
| 232 | - } | |
| 233 | - //DEBUG("HANDSHKE LOOP: %d\n", loopcnt); | |
| 221 | + if ((handshake == expected_value) || | |
| 222 | + (handshake == HANDSHAKE_RESET_VALUE_USB)) { | |
| 223 | + return handshake; | |
| 224 | + } else { | |
| 225 | + loopcnt++; | |
| 226 | + msleep(10); | |
| 227 | + } | |
| 228 | + } | |
| 234 | 229 | |
| 235 | - } | |
| 236 | - | |
| 237 | - //DEBUG("get_handshake: return handshake time out\n"); | |
| 238 | - return HANDSHAKE_TIMEOUT_VALUE; | |
| 230 | + return HANDSHAKE_TIMEOUT_VALUE; | |
| 239 | 231 | } |
| 240 | 232 | |
| 241 | 233 | //--------------------------------------------------------------------------- |