staging: vt6656: rename CARDvSetRSPINF to vnt_set_rspinf

Drop card and rename to vnt_set_rspinf

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 7542b0dfa68051384e6ff9b8d28ec6b13732feda..cf46aa824187397c281b1952845a8ecf049b3237 100644 (file)
--- a/drivers/staging/vt6656/card.c
+++ b/drivers/staging/vt6656/card.c
@@ -20,7 +20,7 @@
  * Purpose: Provide functions to setup NIC operation mode
  * Functions:
  *      s_vSafeResetTx - Rest Tx
- *      CARDvSetRSPINF - Set RSPINF
+ *      vnt_set_rspinf - Set RSPINF
  *      vnt_update_ifs - Update slotTime,SIFS,DIFS, and EIFS
  *      vnt_update_top_rates - Update BasicTopRate
  *      CARDbAddBasicRate - Add to BasicRateSet
@@ -291,7 +291,7 @@ static void vnt_calculate_ofdm_rate(u16 rate, u8 bb_type,
  *
  */
 
-void CARDvSetRSPINF(struct vnt_private *priv, u8 bb_type)
+void vnt_set_rspinf(struct vnt_private *priv, u8 bb_type)
 {
        struct vnt_phy_field phy[4];
        u8 tx_rate[9] = {0, 0, 0, 0, 0, 0, 0, 0, 0}; /* For OFDM */
@@ -846,7 +846,7 @@ void CARDvSetBSSMode(struct vnt_private *priv)
                vnt_control_out_u8(priv, MESSAGE_REQUEST_BBREG, 0x88, 0x08);
 
        vnt_update_ifs(priv);
-       CARDvSetRSPINF(priv, (u8)priv->byBBType);
+       vnt_set_rspinf(priv, (u8)priv->byBBType);
 
        if (priv->byBBType == BB_TYPE_11A) {
                if (priv->byRFType == RF_AIROHA7230) {

diff --git a/drivers/staging/vt6656/card.h b/drivers/staging/vt6656/card.h
index f2afda4337015f011a76652965cd2e2f1403bce1..b52a8c245115442652c94f597328e122b1accb12 100644 (file)
--- a/drivers/staging/vt6656/card.h
+++ b/drivers/staging/vt6656/card.h
@@ -46,7 +46,7 @@ typedef enum _CARD_PHY_TYPE {
 struct vnt_private;
 
 void vnt_set_channel(struct vnt_private *, u32);
-void CARDvSetRSPINF(struct vnt_private *, u8);
+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);

diff --git a/drivers/staging/vt6656/datarate.c b/drivers/staging/vt6656/datarate.c
index 8032d6b5b383ef97bef1b2aa85d7f6980ae649b1..e4a3ac24eee791ac7b42bae037cac58ff594d94e 100644 (file)
--- a/drivers/staging/vt6656/datarate.c
+++ b/drivers/staging/vt6656/datarate.c
@@ -222,7 +222,7 @@ void RATEvParseMaxRate(struct vnt_private *pDevice,
        else
                *pwMaxBasicRate = pDevice->byTopOFDMBasicRate;
        if (wOldBasicRate != pDevice->wBasicRate)
-               CARDvSetRSPINF((void *)pDevice, pDevice->byBBType);
+               vnt_set_rspinf(pDevice, pDevice->byBBType);
 
        DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"Exit ParseMaxRate\n");
 }

diff --git a/drivers/staging/vt6656/wmgr.c b/drivers/staging/vt6656/wmgr.c
index c1151b9acd349c8a2c9cd9c7e19df003e32f47fc..4751242e2a5248fc0608ece2ee480752c464ac22 100644 (file)
--- a/drivers/staging/vt6656/wmgr.c
+++ b/drivers/staging/vt6656/wmgr.c
@@ -1705,7 +1705,7 @@ if(ChannelExceedZoneType(pDevice,byCurrChannel)==true)
                     pDevice->byPreambleType = 0;
                 }
                 if (pDevice->byPreambleType != byOldPreambleType)
-                    CARDvSetRSPINF(pDevice, (u8)pDevice->byBBType);
+                       vnt_set_rspinf(pDevice, (u8)pDevice->byBBType);
             //
             // Basic Rate Set may change dynamically
             //
@@ -1930,7 +1930,7 @@ if(ChannelExceedZoneType(pDevice,byCurrChannel)==true)
                         pDevice->byPreambleType = 0;
                     }
                     if (pDevice->byPreambleType != byOldPreambleType)
-                        CARDvSetRSPINF(pDevice, (u8)pDevice->byBBType);
+                       vnt_set_rspinf(pDevice, (u8)pDevice->byBBType);
 
                      // MACvRegBitsOff(pDevice->PortOffset, MAC_REG_RCR, RCR_BSSID);
                      // set highest basic rate
@@ -2379,7 +2379,7 @@ void vMgrJoinBSSBegin(struct vnt_private *pDevice, PCMD_STATUS pStatus)
                 pDevice->byPreambleType = 0;
             }
             // Change PreambleType must set RSPINF again
-            CARDvSetRSPINF(pDevice, (u8)pDevice->byBBType);
+           vnt_set_rspinf(pDevice, (u8)pDevice->byBBType);
 
             DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"Join ESS\n");
 
@@ -2510,7 +2510,7 @@ void vMgrJoinBSSBegin(struct vnt_private *pDevice, PCMD_STATUS pStatus)
                 pDevice->byPreambleType = 0;
             }
             // Change PreambleType must set RSPINF again
-            CARDvSetRSPINF(pDevice, (u8)pDevice->byBBType);
+           vnt_set_rspinf(pDevice, (u8)pDevice->byBBType);
 
             // Prepare beacon
                bMgrPrepareBeaconToSend((void *) pDevice, pMgmt);