staging: vt6656: rename CARDbClearCurrentTSF to vnt_clear_current_tsf
authorMalcolm Priestley <tvboxspy@gmail.com>
Fri, 30 May 2014 22:22:48 +0000 (23:22 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 19 Jun 2014 22:56:48 +0000 (15:56 -0700)
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>
drivers/staging/vt6656/card.c
drivers/staging/vt6656/card.h
drivers/staging/vt6656/wmgr.c

index c746677a9e7ed09c6d8dd7576c5a0bb96bdd3e79..fdc7cd52112f35a8f76200db64874df69343f9c8 100644 (file)
@@ -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);
 
index 89bbc704c333a2e0f4d4739a1f573cc93d05df0e..78ff81078d4ca0e0e97d1919ecf1c561715bec71 100644 (file)
@@ -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);
index 55b92fe1ec854f3786bf36ee44e3aaaf0047d2a8..5b2e9e57ef418a42628f8b635d35c0869b1a1269 100644 (file)
@@ -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);