From dba066e9fee33671d1437e4a9d515e8134ecac38 Mon Sep 17 00:00:00 2001 From: Malcolm Priestley Date: Fri, 30 May 2014 23:22:48 +0100 Subject: [PATCH] staging: vt6656: rename CARDbClearCurrentTSF to vnt_clear_current_tsf Drop card and rename to vnt_clear_current_tsf Signed-off-by: Malcolm Priestley Signed-off-by: Greg Kroah-Hartman --- drivers/staging/vt6656/card.c | 4 ++-- drivers/staging/vt6656/card.h | 2 +- drivers/staging/vt6656/wmgr.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/staging/vt6656/card.c b/drivers/staging/vt6656/card.c index c746677..fdc7cd5 100644 --- a/drivers/staging/vt6656/card.c +++ b/drivers/staging/vt6656/card.c @@ -633,7 +633,7 @@ bool vnt_get_current_tsf(struct vnt_private *priv, u64 *current_tsf) * Return Value: true if success; otherwise false * */ -bool CARDbClearCurrentTSF(struct vnt_private *priv) +bool vnt_clear_current_tsf(struct vnt_private *priv) { MACvRegBitsOn(priv, MAC_REG_TFTCTL, TFTCTL_TSFCNTRST); @@ -694,7 +694,7 @@ void CARDvSetFirstNextTBTT(struct vnt_private *priv, u16 beacon_interval) u64 next_tbtt = 0; u8 data[8]; - CARDbClearCurrentTSF(priv); + vnt_clear_current_tsf(priv); next_tbtt = CARDqGetNextTBTT(next_tbtt, beacon_interval); diff --git a/drivers/staging/vt6656/card.h b/drivers/staging/vt6656/card.h index 89bbc70..78ff810 100644 --- a/drivers/staging/vt6656/card.h +++ b/drivers/staging/vt6656/card.h @@ -53,7 +53,7 @@ void vnt_add_basic_rate(struct vnt_private *, u16); int vnt_ofdm_min_rate(struct vnt_private *); void vnt_adjust_tsf(struct vnt_private *, u8, u64, u64); bool vnt_get_current_tsf(struct vnt_private *, u64 *); -bool CARDbClearCurrentTSF(struct vnt_private *pDevice); +bool vnt_clear_current_tsf(struct vnt_private *); void CARDvSetFirstNextTBTT(struct vnt_private *pDevice, u16 wBeaconInterval); void CARDvUpdateNextTBTT(struct vnt_private *pDevice, u64 qwTSF, u16 wBeaconInterval); diff --git a/drivers/staging/vt6656/wmgr.c b/drivers/staging/vt6656/wmgr.c index 55b92fe..5b2e9e5 100644 --- a/drivers/staging/vt6656/wmgr.c +++ b/drivers/staging/vt6656/wmgr.c @@ -2046,7 +2046,7 @@ void vMgrCreateOwnIBSS(struct vnt_private *pDevice, PCMD_STATUS pStatus) vnt_get_current_tsf(pDevice, &qwCurrTSF); // clear TSF counter - CARDbClearCurrentTSF(pDevice); + vnt_clear_current_tsf(pDevice); // enable TSF counter MACvRegBitsOn(pDevice,MAC_REG_TFTCTL,TFTCTL_TSFCNTREN); -- 2.7.4