summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMalcolm Priestley <tvboxspy@gmail.com>2014-07-12 07:53:42 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-07-12 13:20:14 -0700
commitcf07bb8e8407057bfc694399ca665c81e0dc15bb (patch)
tree2e06058e53dcc353c595de17ba6a51a062ab125e
parent43878a363b114424290d4c5fd1707fadb8335620 (diff)
staging: vt6656: vRunCommand remove camel case.
pDevice -> priv Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/staging/vt6656/wcmd.c56
1 files changed, 29 insertions, 27 deletions
diff --git a/drivers/staging/vt6656/wcmd.c b/drivers/staging/vt6656/wcmd.c
index 50011937572a..5621c1496fd1 100644
--- a/drivers/staging/vt6656/wcmd.c
+++ b/drivers/staging/vt6656/wcmd.c
@@ -61,78 +61,80 @@ static void vCommandTimerWait(struct vnt_private *priv, unsigned long msecs)
void vRunCommand(struct work_struct *work)
{
- struct vnt_private *pDevice =
+ struct vnt_private *priv =
container_of(work, struct vnt_private, run_command_work.work);
- if (pDevice->Flags & fMP_DISCONNECTED)
+ if (priv->Flags & fMP_DISCONNECTED)
return;
- if (pDevice->bCmdRunning != true)
+ if (priv->bCmdRunning != true)
return;
- switch (pDevice->eCommandState) {
+ switch (priv->eCommandState) {
case WLAN_CMD_INIT_MAC80211_START:
- if (pDevice->mac_hw)
+ if (priv->mac_hw)
break;
- dev_info(&pDevice->usb->dev, "Starting mac80211\n");
+ dev_info(&priv->usb->dev, "Starting mac80211\n");
- if (vnt_init(pDevice)) {
+ if (vnt_init(priv)) {
/* If fail all ends TODO retry */
- dev_err(&pDevice->usb->dev, "failed to start\n");
- ieee80211_free_hw(pDevice->hw);
+ dev_err(&priv->usb->dev, "failed to start\n");
+ ieee80211_free_hw(priv->hw);
return;
}
break;
case WLAN_CMD_TBTT_WAKEUP_START:
- vnt_next_tbtt_wakeup(pDevice);
+ vnt_next_tbtt_wakeup(priv);
break;
case WLAN_CMD_BECON_SEND_START:
- if (!pDevice->vif)
+ if (!priv->vif)
break;
- vnt_beacon_make(pDevice, pDevice->vif);
+ vnt_beacon_make(priv, priv->vif);
- vnt_mac_reg_bits_on(pDevice, MAC_REG_TCR, TCR_AUTOBCNTX);
+ vnt_mac_reg_bits_on(priv, MAC_REG_TCR, TCR_AUTOBCNTX);
break;
case WLAN_CMD_SETPOWER_START:
- vnt_rf_setpower(pDevice, pDevice->wCurrentRate,
- pDevice->hw->conf.chandef.chan->hw_value);
+ vnt_rf_setpower(priv, priv->wCurrentRate,
+ priv->hw->conf.chandef.chan->hw_value);
break;
case WLAN_CMD_CHANGE_ANTENNA_START:
- DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"Change from Antenna%d to", (int)pDevice->dwRxAntennaSel);
- if (pDevice->dwRxAntennaSel == 0) {
- pDevice->dwRxAntennaSel = 1;
- if (pDevice->bTxRxAntInv == true)
- BBvSetAntennaMode(pDevice, ANT_RXA);
+ DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO
+ "Change from Antenna%d to", (int)priv->dwRxAntennaSel);
+
+ if (priv->dwRxAntennaSel == 0) {
+ priv->dwRxAntennaSel = 1;
+ if (priv->bTxRxAntInv == true)
+ BBvSetAntennaMode(priv, ANT_RXA);
else
- BBvSetAntennaMode(pDevice, ANT_RXB);
+ BBvSetAntennaMode(priv, ANT_RXB);
} else {
- pDevice->dwRxAntennaSel = 0;
- if (pDevice->bTxRxAntInv == true)
- BBvSetAntennaMode(pDevice, ANT_RXB);
+ priv->dwRxAntennaSel = 0;
+ if (priv->bTxRxAntInv == true)
+ BBvSetAntennaMode(priv, ANT_RXB);
else
- BBvSetAntennaMode(pDevice, ANT_RXA);
+ BBvSetAntennaMode(priv, ANT_RXA);
}
break;
case WLAN_CMD_11H_CHSW_START:
- vnt_set_channel(pDevice, pDevice->hw->conf.chandef.chan->hw_value);
+ vnt_set_channel(priv, priv->hw->conf.chandef.chan->hw_value);
break;
default:
break;
} //switch
- s_bCommandComplete(pDevice);
+ s_bCommandComplete(priv);
return;
}