diff options
| -rw-r--r-- | drivers/staging/vt6655/card.c | 12 | ||||
| -rw-r--r-- | drivers/staging/vt6655/mac.h | 2 | ||||
| -rw-r--r-- | drivers/staging/vt6655/rf.c | 2 |
3 files changed, 8 insertions, 8 deletions
diff --git a/drivers/staging/vt6655/card.c b/drivers/staging/vt6655/card.c index ec70a1f611d4..846469cc06bb 100644 --- a/drivers/staging/vt6655/card.c +++ b/drivers/staging/vt6655/card.c @@ -352,18 +352,18 @@ void CARDbRadioPowerOff(struct vnt_private *priv) switch (priv->byRFType) { case RF_RFMD2959: - MACvWordRegBitsOff(priv->port_offset, MAC_REG_SOFTPWRCTL, - SOFTPWRCTL_TXPEINV); + vt6655_mac_word_reg_bits_off(priv->port_offset, MAC_REG_SOFTPWRCTL, + SOFTPWRCTL_TXPEINV); vt6655_mac_word_reg_bits_on(priv->port_offset, MAC_REG_SOFTPWRCTL, SOFTPWRCTL_SWPE1); break; case RF_AIROHA: case RF_AL2230S: - MACvWordRegBitsOff(priv->port_offset, MAC_REG_SOFTPWRCTL, - SOFTPWRCTL_SWPE2); - MACvWordRegBitsOff(priv->port_offset, MAC_REG_SOFTPWRCTL, - SOFTPWRCTL_SWPE3); + vt6655_mac_word_reg_bits_off(priv->port_offset, MAC_REG_SOFTPWRCTL, + SOFTPWRCTL_SWPE2); + vt6655_mac_word_reg_bits_off(priv->port_offset, MAC_REG_SOFTPWRCTL, + SOFTPWRCTL_SWPE3); break; } diff --git a/drivers/staging/vt6655/mac.h b/drivers/staging/vt6655/mac.h index 16f2b77e1371..4d328b724559 100644 --- a/drivers/staging/vt6655/mac.h +++ b/drivers/staging/vt6655/mac.h @@ -558,7 +558,7 @@ do { \ iowrite8(reg_value & ~(bit_mask), iobase + reg_offset); \ } while (0) -#define MACvWordRegBitsOff(iobase, reg_offset, bit_mask) \ +#define vt6655_mac_word_reg_bits_off(iobase, reg_offset, bit_mask) \ do { \ unsigned short reg_value; \ reg_value = ioread16(iobase + reg_offset); \ diff --git a/drivers/staging/vt6655/rf.c b/drivers/staging/vt6655/rf.c index 6953afc0be34..1fadc2fc4412 100644 --- a/drivers/staging/vt6655/rf.c +++ b/drivers/staging/vt6655/rf.c @@ -212,7 +212,7 @@ static bool RFbAL2230Init(struct vnt_private *priv) vt6655_mac_word_reg_bits_on(iobase, MAC_REG_SOFTPWRCTL, (SOFTPWRCTL_SWPECTI | SOFTPWRCTL_TXPEINV)); /* PLL Off */ - MACvWordRegBitsOff(iobase, MAC_REG_SOFTPWRCTL, SOFTPWRCTL_SWPE3); + vt6655_mac_word_reg_bits_off(iobase, MAC_REG_SOFTPWRCTL, SOFTPWRCTL_SWPE3); /* patch abnormal AL2230 frequency output */ IFRFbWriteEmbedded(priv, (0x07168700 + (BY_AL2230_REG_LEN << 3) + IFREGCTL_REGW)); |