From 07deb71093f44d350772e98d5008367d0bfd808c Mon Sep 17 00:00:00 2001 From: Malcolm Priestley Date: Sat, 24 May 2014 14:37:07 +0100 Subject: [PATCH] staging: vt6656: camel case clean up CARDbRadioPowerOff camel case changes pDevice -> priv bResult -> ret Signed-off-by: Malcolm Priestley Signed-off-by: Greg Kroah-Hartman --- drivers/staging/vt6656/card.c | 38 +++++++++++++++++------------------ 1 file changed, 18 insertions(+), 20 deletions(-) diff --git a/drivers/staging/vt6656/card.c b/drivers/staging/vt6656/card.c index 09b6de5286ad..2635cf725ad4 100644 --- a/drivers/staging/vt6656/card.c +++ b/drivers/staging/vt6656/card.c @@ -766,38 +766,36 @@ void CARDvUpdateNextTBTT(struct vnt_private *priv, u64 tsf, * * Parameters: * In: - * pDevice - The adapter to be turned off + * priv - The adapter to be turned off * Out: * none * * Return Value: true if success; otherwise false * */ -int CARDbRadioPowerOff(struct vnt_private *pDevice) +int CARDbRadioPowerOff(struct vnt_private *priv) { - int bResult = true; + int ret = true; - //if (pDevice->bRadioOff == true) - // return true; + priv->bRadioOff = true; - pDevice->bRadioOff = true; + switch (priv->byRFType) { + case RF_AL2230: + case RF_AL2230S: + case RF_AIROHA7230: + case RF_VT3226: + case RF_VT3226D0: + case RF_VT3342A0: + MACvRegBitsOff(priv, MAC_REG_SOFTPWRCTL, + (SOFTPWRCTL_SWPE2 | SOFTPWRCTL_SWPE3)); + break; + } - 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 - MACvRegBitsOff(pDevice, MAC_REG_SOFTPWRCTL, (SOFTPWRCTL_SWPE2 | SOFTPWRCTL_SWPE3)); - break; - } + MACvRegBitsOff(priv, MAC_REG_HOSTCR, HOSTCR_RXON); - MACvRegBitsOff(pDevice, MAC_REG_HOSTCR, HOSTCR_RXON); + BBvSetDeepSleep(priv); - BBvSetDeepSleep(pDevice); - - return bResult; + return ret; } /*