staging: vt6656: rename MACvWriteWord to vnt_mac_write_word

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

diff --git a/drivers/staging/vt6656/mac.c b/drivers/staging/vt6656/mac.c
index 58a1a0121afed4cb97e7b1c8e00449a3dd2d3684..d0c3bd3a70ab24831acc1531caef93a2162fd5d8 100644 (file)
--- a/drivers/staging/vt6656/mac.c
+++ b/drivers/staging/vt6656/mac.c
@@ -169,7 +169,7 @@ void vnt_mac_reg_bits_on(struct vnt_private *priv, u8 reg_ofs, u8 bits)
                reg_ofs, MESSAGE_REQUEST_MACREG, ARRAY_SIZE(data), data);
 }
 
-void MACvWriteWord(struct vnt_private *priv, u8 reg_ofs, u16 word)
+void vnt_mac_write_word(struct vnt_private *priv, u8 reg_ofs, u16 word)
 {
        u8 data[2];
 

diff --git a/drivers/staging/vt6656/mac.h b/drivers/staging/vt6656/mac.h
index d41299c820c159f33eb4f8a32f61c59dfe99f698..fa591311e2693927e8a46bdc31e16d3128237fa4 100644 (file)
--- a/drivers/staging/vt6656/mac.h
+++ b/drivers/staging/vt6656/mac.h
@@ -421,7 +421,7 @@ void vnt_mac_disable_keyentry(struct vnt_private *, u8);
 void vnt_mac_set_keyentry(struct vnt_private *, u16, u32, u32, u8 *, u8 *);
 void vnt_mac_reg_bits_off(struct vnt_private *, u8, u8);
 void vnt_mac_reg_bits_on(struct vnt_private *, u8, u8);
-void MACvWriteWord(struct vnt_private *, u8, u16);
+void vnt_mac_write_word(struct vnt_private *, u8, u16);
 void MACvWriteBSSIDAddress(struct vnt_private *, u8 *);
 void MACvEnableProtectMD(struct vnt_private *);
 void MACvDisableProtectMD(struct vnt_private *);

diff --git a/drivers/staging/vt6656/power.c b/drivers/staging/vt6656/power.c
index 7c61da6cb04df660cff958d1c1e3c2ccfdf79ed4..8cc259617338bd7a8b84df648500c4992c54d76e 100644 (file)
--- a/drivers/staging/vt6656/power.c
+++ b/drivers/staging/vt6656/power.c
@@ -64,11 +64,11 @@ void PSvEnablePowerSaving(struct vnt_private *pDevice, u16 wListenInterval)
        u16 wAID = pMgmt->wCurrAID | BIT14 | BIT15;
 
        /* set period of power up before TBTT */
-       MACvWriteWord(pDevice, MAC_REG_PWBT, C_PWBT);
+       vnt_mac_write_word(pDevice, MAC_REG_PWBT, C_PWBT);
 
        if (pDevice->op_mode != NL80211_IFTYPE_ADHOC) {
                /* set AID */
-               MACvWriteWord(pDevice, MAC_REG_AIDATIM, wAID);
+               vnt_mac_write_word(pDevice, MAC_REG_AIDATIM, wAID);
        }
 
        /* Warren:06-18-2004,the sequence must follow