summaryrefslogtreecommitdiffstats
path: root/drivers/staging/vt6656/card.c
diff options
context:
space:
mode:
authorMalcolm Priestley2014-05-31 12:50:42 +0200
committerGreg Kroah-Hartman2014-06-20 00:57:37 +0200
commit369575377e8d47a9f7592f24917556f0c9996eaa (patch)
tree672797d3bd3b802c9264ea80b30cb4f0d749d853 /drivers/staging/vt6656/card.c
parentstaging: vt6656: rename MACvRegBitsOff to vnt_mac_reg_bits_off (diff)
downloadkernel-qcow2-linux-369575377e8d47a9f7592f24917556f0c9996eaa.tar.gz
kernel-qcow2-linux-369575377e8d47a9f7592f24917556f0c9996eaa.tar.xz
kernel-qcow2-linux-369575377e8d47a9f7592f24917556f0c9996eaa.zip
staging: vt6656: rename MACvRegBitsOff to vnt_mac_reg_bits_off
Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/vt6656/card.c')
-rw-r--r--drivers/staging/vt6656/card.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/staging/vt6656/card.c b/drivers/staging/vt6656/card.c
index 4e3f34a1c73a..9794116a241b 100644
--- a/drivers/staging/vt6656/card.c
+++ b/drivers/staging/vt6656/card.c
@@ -89,7 +89,7 @@ void vnt_set_channel(struct vnt_private *priv, u32 connection_channel)
}
/* clear NAV */
- MACvRegBitsOn(priv, MAC_REG_MACCR, MACCR_CLRNAV);
+ vnt_mac_reg_bits_on(priv, MAC_REG_MACCR, MACCR_CLRNAV);
/* Set Channel[7] = 0 to tell H/W channel is changing now. */
vnt_mac_reg_bits_off(priv, MAC_REG_CHANNEL, 0xb0);
@@ -636,7 +636,7 @@ bool vnt_get_current_tsf(struct vnt_private *priv, u64 *current_tsf)
bool vnt_clear_current_tsf(struct vnt_private *priv)
{
- MACvRegBitsOn(priv, MAC_REG_TFTCTL, TFTCTL_TSFCNTRST);
+ vnt_mac_reg_bits_on(priv, MAC_REG_TFTCTL, TFTCTL_TSFCNTRST);
priv->qwCurrTSF = 0;
@@ -812,7 +812,7 @@ int vnt_radio_power_on(struct vnt_private *priv)
BBvExitDeepSleep(priv);
- MACvRegBitsOn(priv, MAC_REG_HOSTCR, HOSTCR_RXON);
+ vnt_mac_reg_bits_on(priv, MAC_REG_HOSTCR, HOSTCR_RXON);
switch (priv->byRFType) {
case RF_AL2230:
@@ -821,7 +821,7 @@ int vnt_radio_power_on(struct vnt_private *priv)
case RF_VT3226:
case RF_VT3226D0:
case RF_VT3342A0:
- MACvRegBitsOn(priv, MAC_REG_SOFTPWRCTL,
+ vnt_mac_reg_bits_on(priv, MAC_REG_SOFTPWRCTL,
(SOFTPWRCTL_SWPE2 | SOFTPWRCTL_SWPE3));
break;
}