[PATCH 06/10] staging: vt6656: s_bCommandComplete remove else from if

[Malcolm Priestley <tvboxspy@xxxxxxxxx>]

if returns out so remove else

Signed-off-by: Malcolm Priestley <tvboxspy@xxxxxxxxx>
---
 drivers/staging/vt6656/wcmd.c | 60 ++++++++++++++++++++++---------------------
 1 file changed, 31 insertions(+), 29 deletions(-)

diff --git a/drivers/staging/vt6656/wcmd.c b/drivers/staging/vt6656/wcmd.c
index 1987d5c..cc9d50a 100644
--- a/drivers/staging/vt6656/wcmd.c
+++ b/drivers/staging/vt6656/wcmd.c
@@ -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;
 }
 
-- 
1.9.1

--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html