]> git.karo-electronics.de Git - linux-beck.git/commitdiff
staging: vt6656: s_bCommandComplete remove else from if
authorMalcolm Priestley <tvboxspy@gmail.com>
Sat, 12 Jul 2014 06:53:44 +0000 (07:53 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 12 Jul 2014 20:20:14 +0000 (13:20 -0700)
if returns out so remove else

Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/vt6656/wcmd.c

index 1987d5c3ee01a657ed68440458e98ea72dd81a3b..cc9d50aa2aca4238755c24d33cdc99ebd87277e3 100644 (file)
@@ -147,43 +147,45 @@ static int s_bCommandComplete(struct vnt_private *pDevice)
                //Command Queue Empty
                pDevice->bCmdRunning = false;
                return true;
-       } else {
-               pDevice->eCommand = pDevice->eCmdQueue[pDevice->uCmdDequeueIdx].eCmd;
-
-               ADD_ONE_WITH_WRAP_AROUND(pDevice->uCmdDequeueIdx, CMD_Q_SIZE);
-               pDevice->cbFreeCmdQueue++;
-               pDevice->bCmdRunning = true;
-               switch (pDevice->eCommand) {
-               case WLAN_CMD_INIT_MAC80211:
-                       pDevice->eCommandState = WLAN_CMD_INIT_MAC80211_START;
-                       break;
+       }
 
-               case WLAN_CMD_TBTT_WAKEUP:
-                       pDevice->eCommandState = WLAN_CMD_TBTT_WAKEUP_START;
-                       break;
+       pDevice->eCommand = pDevice->eCmdQueue[pDevice->uCmdDequeueIdx].eCmd;
 
-               case WLAN_CMD_BECON_SEND:
-                       pDevice->eCommandState = WLAN_CMD_BECON_SEND_START;
-                       break;
+       ADD_ONE_WITH_WRAP_AROUND(pDevice->uCmdDequeueIdx, CMD_Q_SIZE);
+       pDevice->cbFreeCmdQueue++;
+       pDevice->bCmdRunning = true;
 
-               case WLAN_CMD_SETPOWER:
-                       pDevice->eCommandState = WLAN_CMD_SETPOWER_START;
-                       break;
+       switch (pDevice->eCommand) {
+       case WLAN_CMD_INIT_MAC80211:
+               pDevice->eCommandState = WLAN_CMD_INIT_MAC80211_START;
+               break;
 
-               case WLAN_CMD_CHANGE_ANTENNA:
-                       pDevice->eCommandState = WLAN_CMD_CHANGE_ANTENNA_START;
-                       break;
+       case WLAN_CMD_TBTT_WAKEUP:
+               pDevice->eCommandState = WLAN_CMD_TBTT_WAKEUP_START;
+               break;
 
-               case WLAN_CMD_11H_CHSW:
-                       pDevice->eCommandState = WLAN_CMD_11H_CHSW_START;
-                       break;
+       case WLAN_CMD_BECON_SEND:
+               pDevice->eCommandState = WLAN_CMD_BECON_SEND_START;
+               break;
 
-               default:
-                       break;
-               }
-               vCommandTimerWait(pDevice, 0);
+       case WLAN_CMD_SETPOWER:
+               pDevice->eCommandState = WLAN_CMD_SETPOWER_START;
+               break;
+
+       case WLAN_CMD_CHANGE_ANTENNA:
+               pDevice->eCommandState = WLAN_CMD_CHANGE_ANTENNA_START;
+               break;
+
+       case WLAN_CMD_11H_CHSW:
+               pDevice->eCommandState = WLAN_CMD_11H_CHSW_START;
+               break;
+
+       default:
+               break;
        }
 
+       vCommandTimerWait(pDevice, 0);
+
        return true;
 }