From d287093e4cd76b28e1312ae6ff577aea20aba47c Mon Sep 17 00:00:00 2001 From: Malcolm Priestley Date: Sat, 12 Jul 2014 07:53:45 +0100 Subject: [PATCH] staging: vt6656: s_bCommandComplete clean up and remove camel case pDevice -> priv Signed-off-by: Malcolm Priestley Signed-off-by: Greg Kroah-Hartman --- drivers/staging/vt6656/wcmd.c | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/drivers/staging/vt6656/wcmd.c b/drivers/staging/vt6656/wcmd.c index cc9d50aa2aca..cdd828c25a07 100644 --- a/drivers/staging/vt6656/wcmd.c +++ b/drivers/staging/vt6656/wcmd.c @@ -139,52 +139,52 @@ void vRunCommand(struct work_struct *work) return; } -static int s_bCommandComplete(struct vnt_private *pDevice) +static int s_bCommandComplete(struct vnt_private *priv) { - pDevice->eCommandState = WLAN_CMD_IDLE; - if (pDevice->cbFreeCmdQueue == CMD_Q_SIZE) { - //Command Queue Empty - pDevice->bCmdRunning = false; + priv->eCommandState = WLAN_CMD_IDLE; + if (priv->cbFreeCmdQueue == CMD_Q_SIZE) { + /* Command Queue Empty */ + priv->bCmdRunning = false; return true; } - pDevice->eCommand = pDevice->eCmdQueue[pDevice->uCmdDequeueIdx].eCmd; + priv->eCommand = priv->eCmdQueue[priv->uCmdDequeueIdx].eCmd; - ADD_ONE_WITH_WRAP_AROUND(pDevice->uCmdDequeueIdx, CMD_Q_SIZE); - pDevice->cbFreeCmdQueue++; - pDevice->bCmdRunning = true; + ADD_ONE_WITH_WRAP_AROUND(priv->uCmdDequeueIdx, CMD_Q_SIZE); + priv->cbFreeCmdQueue++; + priv->bCmdRunning = true; - switch (pDevice->eCommand) { + switch (priv->eCommand) { case WLAN_CMD_INIT_MAC80211: - pDevice->eCommandState = WLAN_CMD_INIT_MAC80211_START; + priv->eCommandState = WLAN_CMD_INIT_MAC80211_START; break; case WLAN_CMD_TBTT_WAKEUP: - pDevice->eCommandState = WLAN_CMD_TBTT_WAKEUP_START; + priv->eCommandState = WLAN_CMD_TBTT_WAKEUP_START; break; case WLAN_CMD_BECON_SEND: - pDevice->eCommandState = WLAN_CMD_BECON_SEND_START; + priv->eCommandState = WLAN_CMD_BECON_SEND_START; break; case WLAN_CMD_SETPOWER: - pDevice->eCommandState = WLAN_CMD_SETPOWER_START; + priv->eCommandState = WLAN_CMD_SETPOWER_START; break; case WLAN_CMD_CHANGE_ANTENNA: - pDevice->eCommandState = WLAN_CMD_CHANGE_ANTENNA_START; + priv->eCommandState = WLAN_CMD_CHANGE_ANTENNA_START; break; case WLAN_CMD_11H_CHSW: - pDevice->eCommandState = WLAN_CMD_11H_CHSW_START; + priv->eCommandState = WLAN_CMD_11H_CHSW_START; break; default: break; } - vCommandTimerWait(pDevice, 0); + vCommandTimerWait(priv, 0); return true; } -- 2.39.5