From: Malcolm Priestley Date: Sat, 31 May 2014 10:50:43 +0000 (+0100) Subject: staging: vt6656: rename MACvWriteWord to vnt_mac_write_word X-Git-Tag: v3.17-rc1~123^2~1756 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=57dc49a6c085643e69ed88aa99e8660000737989;p=platform%2Fkernel%2Flinux-exynos.git staging: vt6656: rename MACvWriteWord to vnt_mac_write_word Signed-off-by: Malcolm Priestley Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/vt6656/mac.c b/drivers/staging/vt6656/mac.c index 58a1a01..d0c3bd3 100644 --- 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 d41299c..fa59131 100644 --- 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 7c61da6..8cc2596 100644 --- 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