staging: vt6655: channel.c replace pDevice with priv

Removing camel case.

Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/vt6655/channel.c b/drivers/staging/vt6655/channel.c
index 7a717828fa09d37e11151d659c7514af430eb596..6edccb42231ee193180570172a43a3ae7e375ec4 100644 (file)
--- a/drivers/staging/vt6655/channel.c
+++ b/drivers/staging/vt6655/channel.c
@@ -176,62 +176,62 @@ void vnt_init_bands(struct vnt_private *priv)
  */
 bool set_channel(void *pDeviceHandler, struct ieee80211_channel *ch)
 {
-       struct vnt_private *pDevice = pDeviceHandler;
+       struct vnt_private *priv = pDeviceHandler;
        bool bResult = true;
 
-       if (pDevice->byCurrentCh == ch->hw_value)
+       if (priv->byCurrentCh == ch->hw_value)
                return bResult;
 
        /* Set VGA to max sensitivity */
-       if (pDevice->bUpdateBBVGA &&
-           pDevice->byBBVGACurrent != pDevice->abyBBVGA[0]) {
-               pDevice->byBBVGACurrent = pDevice->abyBBVGA[0];
+       if (priv->bUpdateBBVGA &&
+           priv->byBBVGACurrent != priv->abyBBVGA[0]) {
+               priv->byBBVGACurrent = priv->abyBBVGA[0];
 
-               BBvSetVGAGainOffset(pDevice, pDevice->byBBVGACurrent);
+               BBvSetVGAGainOffset(priv, priv->byBBVGACurrent);
        }
 
        /* clear NAV */
-       MACvRegBitsOn(pDevice->PortOffset, MAC_REG_MACCR, MACCR_CLRNAV);
+       MACvRegBitsOn(priv->PortOffset, MAC_REG_MACCR, MACCR_CLRNAV);
 
        /* TX_PE will reserve 3 us for MAX2829 A mode only,
           it is for better TX throughput */
 
-       if (pDevice->byRFType == RF_AIROHA7230)
-               RFbAL7230SelectChannelPostProcess(pDevice, pDevice->byCurrentCh,
+       if (priv->byRFType == RF_AIROHA7230)
+               RFbAL7230SelectChannelPostProcess(priv, priv->byCurrentCh,
                                                  ch->hw_value);
 
-       pDevice->byCurrentCh = ch->hw_value;
-       bResult &= RFbSelectChannel(pDevice, pDevice->byRFType,
+       priv->byCurrentCh = ch->hw_value;
+       bResult &= RFbSelectChannel(priv, priv->byRFType,
                                    ch->hw_value);
 
        /* Init Synthesizer Table */
-       if (pDevice->bEnablePSMode)
-               RFvWriteWakeProgSyn(pDevice, pDevice->byRFType, ch->hw_value);
+       if (priv->bEnablePSMode)
+               RFvWriteWakeProgSyn(priv, priv->byRFType, ch->hw_value);
 
-       BBvSoftwareReset(pDevice);
+       BBvSoftwareReset(priv);
 
-       if (pDevice->byLocalID > REV_ID_VT3253_B1) {
+       if (priv->byLocalID > REV_ID_VT3253_B1) {
                unsigned long flags;
 
-               spin_lock_irqsave(&pDevice->lock, flags);
+               spin_lock_irqsave(&priv->lock, flags);
 
                /* set HW default power register */
-               MACvSelectPage1(pDevice->PortOffset);
-               RFbSetPower(pDevice, RATE_1M, pDevice->byCurrentCh);
-               VNSvOutPortB(pDevice->PortOffset + MAC_REG_PWRCCK,
-                            pDevice->byCurPwr);
-               RFbSetPower(pDevice, RATE_6M, pDevice->byCurrentCh);
-               VNSvOutPortB(pDevice->PortOffset + MAC_REG_PWROFDM,
-                            pDevice->byCurPwr);
-               MACvSelectPage0(pDevice->PortOffset);
-
-               spin_unlock_irqrestore(&pDevice->lock, flags);
+               MACvSelectPage1(priv->PortOffset);
+               RFbSetPower(priv, RATE_1M, priv->byCurrentCh);
+               VNSvOutPortB(priv->PortOffset + MAC_REG_PWRCCK,
+                            priv->byCurPwr);
+               RFbSetPower(priv, RATE_6M, priv->byCurrentCh);
+               VNSvOutPortB(priv->PortOffset + MAC_REG_PWROFDM,
+                            priv->byCurPwr);
+               MACvSelectPage0(priv->PortOffset);
+
+               spin_unlock_irqrestore(&priv->lock, flags);
        }
 
-       if (pDevice->byBBType == BB_TYPE_11B)
-               RFbSetPower(pDevice, RATE_1M, pDevice->byCurrentCh);
+       if (priv->byBBType == BB_TYPE_11B)
+               RFbSetPower(priv, RATE_1M, priv->byCurrentCh);
        else
-               RFbSetPower(pDevice, RATE_6M, pDevice->byCurrentCh);
+               RFbSetPower(priv, RATE_6M, priv->byCurrentCh);
 
        return bResult;
 }