summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMalcolm Priestley <tvboxspy@gmail.com>2014-05-24 14:37:08 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-05-25 10:58:26 -0700
commitf320314435163773a03a33ca533ba9dd926c376b (patch)
tree8b113e8a108a9aa1d259920c08ae7e5bb2645f00
parent07deb71093f44d350772e98d5008367d0bfd808c (diff)
staging: vt6656: camel case clean up CARDbRadioPowerOn
camel case changes pDevice -> priv bResult -> ret Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/staging/vt6656/card.c43
1 files changed, 20 insertions, 23 deletions
diff --git a/drivers/staging/vt6656/card.c b/drivers/staging/vt6656/card.c
index 2635cf725ad4..3d417095b934 100644
--- a/drivers/staging/vt6656/card.c
+++ b/drivers/staging/vt6656/card.c
@@ -803,42 +803,39 @@ int CARDbRadioPowerOff(struct vnt_private *priv)
*
* Parameters:
* In:
- * pDevice - The adapter to be turned on
+ * priv - The adapter to be turned on
* Out:
* none
*
* Return Value: true if success; otherwise false
*
*/
-int CARDbRadioPowerOn(struct vnt_private *pDevice)
+int CARDbRadioPowerOn(struct vnt_private *priv)
{
- int bResult = true;
-
- if ((pDevice->bHWRadioOff == true) || (pDevice->bRadioControlOff == true)) {
- return false;
- }
+ int ret = true;
- //if (pDevice->bRadioOff == false)
- // return true;
+ if (priv->bHWRadioOff == true || priv->bRadioControlOff == true)
+ return false;
- pDevice->bRadioOff = false;
+ priv->bRadioOff = false;
- BBvExitDeepSleep(pDevice);
+ BBvExitDeepSleep(priv);
- MACvRegBitsOn(pDevice, MAC_REG_HOSTCR, HOSTCR_RXON);
+ MACvRegBitsOn(priv, MAC_REG_HOSTCR, HOSTCR_RXON);
- switch (pDevice->byRFType) {
- case RF_AL2230:
- case RF_AL2230S:
- case RF_AIROHA7230:
- case RF_VT3226: //RobertYu:20051111
- case RF_VT3226D0:
- case RF_VT3342A0: //RobertYu:20060609
- MACvRegBitsOn(pDevice, MAC_REG_SOFTPWRCTL, (SOFTPWRCTL_SWPE2 | SOFTPWRCTL_SWPE3));
- break;
- }
+ switch (priv->byRFType) {
+ case RF_AL2230:
+ case RF_AL2230S:
+ case RF_AIROHA7230:
+ case RF_VT3226:
+ case RF_VT3226D0:
+ case RF_VT3342A0:
+ MACvRegBitsOn(priv, MAC_REG_SOFTPWRCTL,
+ (SOFTPWRCTL_SWPE2 | SOFTPWRCTL_SWPE3));
+ break;
+ }
- return bResult;
+ return ret;
}
void CARDvSetBSSMode(struct vnt_private *pDevice)