summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMalcolm Priestley2014-05-31 00:22:48 +0200
committerGreg Kroah-Hartman2014-06-20 00:56:48 +0200
commitdba066e9fee33671d1437e4a9d515e8134ecac38 (patch)
tree89b2d2a139c6c7aa24a13f6125d401fcb8f094a0
parentstaging: vt6656: rename CARDbGetCurrentTSF to vnt_get_current_tsf (diff)
downloadkernel-qcow2-linux-dba066e9fee33671d1437e4a9d515e8134ecac38.tar.gz
kernel-qcow2-linux-dba066e9fee33671d1437e4a9d515e8134ecac38.tar.xz
kernel-qcow2-linux-dba066e9fee33671d1437e4a9d515e8134ecac38.zip
staging: vt6656: rename CARDbClearCurrentTSF to vnt_clear_current_tsf
Drop card and rename to vnt_clear_current_tsf Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/staging/vt6656/card.c4
-rw-r--r--drivers/staging/vt6656/card.h2
-rw-r--r--drivers/staging/vt6656/wmgr.c2
3 files changed, 4 insertions, 4 deletions
diff --git a/drivers/staging/vt6656/card.c b/drivers/staging/vt6656/card.c
index c746677a9e7e..fdc7cd52112f 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 89bbc704c333..78ff81078d4c 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 55b92fe1ec85..5b2e9e57ef41 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);