staging: vt6656: rename CARDbAddBasicRate to vnt_add_basic_rate

Drop card and rename to vnt_add_basic_rate

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

diff --git a/drivers/staging/vt6656/card.c b/drivers/staging/vt6656/card.c
index cf46aa824187397c281b1952845a8ecf049b3237..a90507694ea773b286ee7265f544f80658622072 100644 (file)
--- a/drivers/staging/vt6656/card.c
+++ b/drivers/staging/vt6656/card.c
@@ -23,7 +23,7 @@
  *      vnt_set_rspinf - Set RSPINF
  *      vnt_update_ifs - Update slotTime,SIFS,DIFS, and EIFS
  *      vnt_update_top_rates - Update BasicTopRate
- *      CARDbAddBasicRate - Add to BasicRateSet
+ *      vnt_add_basic_rate - Add to BasicRateSet
  *      CARDbSetBasicRate - Set Basic Tx Rate
  *      CARDbIsOFDMinBasicRate - Check if any OFDM rate is in BasicRateSet
  *      CARDvSetLoopbackMode - Set Loopback mode
@@ -505,7 +505,7 @@ void vnt_update_top_rates(struct vnt_private *priv)
  * Return Value: true if succeeded; false if failed.
  *
  */
-void CARDbAddBasicRate(struct vnt_private *priv, u16 rate_idx)
+void vnt_add_basic_rate(struct vnt_private *priv, u16 rate_idx)
 {
 
        priv->wBasicRate |= (1 << rate_idx);

diff --git a/drivers/staging/vt6656/card.h b/drivers/staging/vt6656/card.h
index b52a8c245115442652c94f597328e122b1accb12..ef5a671282a56e0c88b72b27ac04ad8dacc21710 100644 (file)
--- a/drivers/staging/vt6656/card.h
+++ b/drivers/staging/vt6656/card.h
@@ -49,7 +49,7 @@ void vnt_set_channel(struct vnt_private *, u32);
 void vnt_set_rspinf(struct vnt_private *, u8);
 void vnt_update_ifs(struct vnt_private *);
 void vnt_update_top_rates(struct vnt_private *);
-void CARDbAddBasicRate(struct vnt_private *, u16);
+void vnt_add_basic_rate(struct vnt_private *, u16);
 int CARDbIsOFDMinBasicRate(struct vnt_private *pDevice);
 void CARDvAdjustTSF(struct vnt_private *pDevice, u8 byRxRate,
                u64 qwBSSTimestamp, u64 qwLocalTSF);

diff --git a/drivers/staging/vt6656/datarate.c b/drivers/staging/vt6656/datarate.c
index e4a3ac24eee791ac7b42bae037cac58ff594d94e..517fbf7680eda77113c0580563adb98dc496e0c9 100644 (file)
--- a/drivers/staging/vt6656/datarate.c
+++ b/drivers/staging/vt6656/datarate.c
@@ -163,7 +163,7 @@ void RATEvParseMaxRate(struct vnt_private *pDevice,
                         * add to basic rate set, update pDevice->byTopCCKBasicRate and
                         * pDevice->byTopOFDMBasicRate
                         */
-                       CARDbAddBasicRate((void *)pDevice, RATEwGetRateIdx(byRate));
+                       vnt_add_basic_rate(pDevice, RATEwGetRateIdx(byRate));
                        DBG_PRT(MSG_LEVEL_DEBUG,
                                KERN_INFO"ParseMaxRate AddBasicRate: %d\n",
                                RATEwGetRateIdx(byRate));
@@ -191,7 +191,7 @@ void RATEvParseMaxRate(struct vnt_private *pDevice,
                                 * add to basic rate set, update pDevice->byTopCCKBasicRate and
                                 * pDevice->byTopOFDMBasicRate
                                 */
-                               CARDbAddBasicRate((void *)pDevice, RATEwGetRateIdx(byRate));
+                               vnt_add_basic_rate(pDevice, RATEwGetRateIdx(byRate));
                                DBG_PRT(MSG_LEVEL_DEBUG,
                                                KERN_INFO"ParseMaxRate AddBasicRate: %d\n",
                                                RATEwGetRateIdx(byRate));

diff --git a/drivers/staging/vt6656/main_usb.c b/drivers/staging/vt6656/main_usb.c
index aca486dc391d188db3ac53004d2663ba5e964d10..636afc2fdb170088b15c41f5d638f2b60ba04d92 100644 (file)
--- a/drivers/staging/vt6656/main_usb.c
+++ b/drivers/staging/vt6656/main_usb.c
@@ -517,10 +517,10 @@ static int device_init_registers(struct vnt_private *pDevice)
        * set Short Slot Time, xIFS, and RSPINF
        */
        if (pDevice->byBBType == BB_TYPE_11A) {
-               CARDbAddBasicRate(pDevice, RATE_6M);
+               vnt_add_basic_rate(pDevice, RATE_6M);
                pDevice->bShortSlotTime = true;
        } else {
-               CARDbAddBasicRate(pDevice, RATE_1M);
+               vnt_add_basic_rate(pDevice, RATE_1M);
                pDevice->bShortSlotTime = false;
        }
 

diff --git a/drivers/staging/vt6656/wmgr.c b/drivers/staging/vt6656/wmgr.c
index 4751242e2a5248fc0608ece2ee480752c464ac22..652e8b682bdfec73e6e465d15c4a76d13f79a515 100644 (file)
--- a/drivers/staging/vt6656/wmgr.c
+++ b/drivers/staging/vt6656/wmgr.c
@@ -2573,7 +2573,7 @@ static void s_vMgrSynchBSS(struct vnt_private *pDevice, u32 uBSSMode,
     pDevice->byPreambleType = 0;
     pDevice->wBasicRate = 0;
     // Set Basic Rate
-    CARDbAddBasicRate((void *)pDevice, RATE_1M);
+    vnt_add_basic_rate(pDevice, RATE_1M);
 
     // calculate TSF offset
     // TSF Offset = Received Timestamp TSF - Marked Local's TSF