staging: rtl8192e: Rename rtl8192_QueryBBReg

Use naming schema found in other rtlwifi devices.
Rename rtl8192_QueryBBReg to rtl92e_get_bb_reg.

Signed-off-by: Mateusz Kulikowski <mateusz.kulikowski@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/rtl8192e/rtl8192e/r8190P_rtl8256.c b/drivers/staging/rtl8192e/rtl8192e/r8190P_rtl8256.c
index 92bac86..c3abd29 100644 (file)
--- a/drivers/staging/rtl8192e/rtl8192e/r8190P_rtl8256.c
+++ b/drivers/staging/rtl8192e/rtl8192e/r8190P_rtl8256.c
@@ -105,13 +105,13 @@ static bool phy_RF8256_Config_ParaFile(struct net_device *dev)
                switch (eRFPath) {
                case RF90_PATH_A:
                case RF90_PATH_C:
-                       u4RegValue = rtl8192_QueryBBReg(dev, pPhyReg->rfintfs,
-                                                       bRFSI_RFENV);
+                       u4RegValue = rtl92e_get_bb_reg(dev, pPhyReg->rfintfs,
+                                                      bRFSI_RFENV);
                        break;
                case RF90_PATH_B:
                case RF90_PATH_D:
-                       u4RegValue = rtl8192_QueryBBReg(dev, pPhyReg->rfintfs,
-                                                       bRFSI_RFENV<<16);
+                       u4RegValue = rtl92e_get_bb_reg(dev, pPhyReg->rfintfs,
+                                                      bRFSI_RFENV<<16);
                        break;
                }
 

diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c b/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c
index 8f3172e..4e0ce87 100644 (file)
--- a/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c
+++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c
@@ -910,10 +910,10 @@ start:
                dm_initialize_txpower_tracking(dev);
 
                if (priv->IC_Cut >= IC_VersionCut_D) {
-                       tmpRegA = rtl8192_QueryBBReg(dev,
-                                 rOFDM0_XATxIQImbalance, bMaskDWord);
-                       tmpRegC = rtl8192_QueryBBReg(dev,
-                                 rOFDM0_XCTxIQImbalance, bMaskDWord);
+                       tmpRegA = rtl92e_get_bb_reg(dev, rOFDM0_XATxIQImbalance,
+                                                   bMaskDWord);
+                       tmpRegC = rtl92e_get_bb_reg(dev, rOFDM0_XCTxIQImbalance,
+                                                   bMaskDWord);
                        for (i = 0; i < TxBBGainTableLength; i++) {
                                if (tmpRegA == dm_tx_bb_gain[i]) {
                                        priv->rfa_txpowertrackingindex = (u8)i;
@@ -925,8 +925,8 @@ start:
                                }
                        }
 
-                       TempCCk = rtl8192_QueryBBReg(dev,
-                                 rCCK0_TxFilter1, bMaskByte2);
+                       TempCCk = rtl92e_get_bb_reg(dev, rCCK0_TxFilter1,
+                                                   bMaskByte2);
 
                        for (i = 0; i < CCKTxBBGainTableLength; i++) {
                                if (TempCCk == dm_cck_tx_bb_gain[i][0]) {
@@ -1516,8 +1516,9 @@ static void rtl8192_query_rxphystatus(
        pstats->bPacketBeacon = precord_stats->bPacketBeacon = bPacketBeacon;
        pstats->bToSelfBA = precord_stats->bToSelfBA = bToSelfBA;
        if (check_reg824 == 0) {
-               reg824_bit9 = rtl8192_QueryBBReg(priv->rtllib->dev,
-                             rFPGA0_XA_HSSIParameter2, 0x200);
+               reg824_bit9 = rtl92e_get_bb_reg(priv->rtllib->dev,
+                                               rFPGA0_XA_HSSIParameter2,
+                                               0x200);
                check_reg824 = 1;
        }
 

diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c b/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c
index f575ee1..a993cc7 100644 (file)
--- a/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c
+++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c
@@ -96,7 +96,7 @@ void rtl8192_setBBreg(struct net_device *dev, u32 dwRegAddr, u32 dwBitMask,
                write_nic_dword(dev, dwRegAddr, dwData);
 }
 
-u32 rtl8192_QueryBBReg(struct net_device *dev, u32 dwRegAddr, u32 dwBitMask)
+u32 rtl92e_get_bb_reg(struct net_device *dev, u32 dwRegAddr, u32 dwBitMask)
 {
        u32 Ret = 0, OriginalValue, BitShift;
 
@@ -146,8 +146,8 @@ static u32 rtl8192_phy_RFSerialRead(struct net_device *dev,
 
        mdelay(1);
 
-       ret = rtl8192_QueryBBReg(dev, pPhyReg->rfLSSIReadBack,
-                                bLSSIReadBackData);
+       ret = rtl92e_get_bb_reg(dev, pPhyReg->rfLSSIReadBack,
+                               bLSSIReadBackData);
 
        if (priv->rf_chip == RF_8256) {
                priv->RfReg0Value[eRFPath] &= 0xebf;
@@ -1309,19 +1309,19 @@ void rtl92e_init_gain(struct net_device *dev, u8 Operation)
                            DIG_ALGO_BY_FALSE_ALARM)
                                rtl8192_setBBreg(dev, UFWP, bMaskByte1, 0x8);
                        priv->initgain_backup.xaagccore1 =
-                                (u8)rtl8192_QueryBBReg(dev, rOFDM0_XAAGCCore1,
-                                BitMask);
+                                (u8)rtl92e_get_bb_reg(dev, rOFDM0_XAAGCCore1,
+                                                      BitMask);
                        priv->initgain_backup.xbagccore1 =
-                                (u8)rtl8192_QueryBBReg(dev, rOFDM0_XBAGCCore1,
-                                BitMask);
+                                (u8)rtl92e_get_bb_reg(dev, rOFDM0_XBAGCCore1,
+                                                      BitMask);
                        priv->initgain_backup.xcagccore1 =
-                                (u8)rtl8192_QueryBBReg(dev, rOFDM0_XCAGCCore1,
-                                BitMask);
+                                (u8)rtl92e_get_bb_reg(dev, rOFDM0_XCAGCCore1,
+                                                      BitMask);
                        priv->initgain_backup.xdagccore1 =
-                                (u8)rtl8192_QueryBBReg(dev, rOFDM0_XDAGCCore1,
-                                BitMask);
+                                (u8)rtl92e_get_bb_reg(dev, rOFDM0_XDAGCCore1,
+                                                      BitMask);
                        BitMask = bMaskByte2;
-                       priv->initgain_backup.cca = (u8)rtl8192_QueryBBReg(dev,
+                       priv->initgain_backup.cca = (u8)rtl92e_get_bb_reg(dev,
                                                    rCCK0_CCA, BitMask);
 
                        RT_TRACE(COMP_SCAN,

diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.h b/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.h
index 3bfde0d..7a147ec 100644 (file)
--- a/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.h
+++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.h
@@ -70,8 +70,8 @@ enum rf90_radio_path {
 extern u8 rtl92e_is_legal_rf_path(struct net_device *dev, u32 eRFPath);
 extern void rtl8192_setBBreg(struct net_device *dev, u32 dwRegAddr,
                             u32 dwBitMask, u32 dwData);
-extern u32 rtl8192_QueryBBReg(struct net_device *dev, u32 dwRegAddr,
-                             u32 dwBitMask);
+extern u32 rtl92e_get_bb_reg(struct net_device *dev, u32 dwRegAddr,
+                            u32 dwBitMask);
 extern void rtl92e_set_rf_reg(struct net_device *dev,
                              enum rf90_radio_path eRFPath, u32 RegAddr,
                              u32 BitMask, u32 Data);

diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c b/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c
index fe8f291..2137252 100644 (file)
--- a/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c
+++ b/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c
@@ -856,8 +856,8 @@ static void dm_TXPowerTrackingCallback_ThermalMeter(struct net_device *dev)
        int i = 0, CCKSwingNeedUpdate = 0;
 
        if (!priv->btxpower_trackingInit) {
-               tmpRegA = rtl8192_QueryBBReg(dev, rOFDM0_XATxIQImbalance,
-                                            bMaskDWord);
+               tmpRegA = rtl92e_get_bb_reg(dev, rOFDM0_XATxIQImbalance,
+                                           bMaskDWord);
                for (i = 0; i < OFDM_Table_Length; i++) {
                        if (tmpRegA == OFDMSwingTable[i]) {
                                priv->OFDM_index[0] = (u8)i;
@@ -868,7 +868,7 @@ static void dm_TXPowerTrackingCallback_ThermalMeter(struct net_device *dev)
                        }
                }
 
-               TempCCk = rtl8192_QueryBBReg(dev, rCCK0_TxFilter1, bMaskByte2);
+               TempCCk = rtl92e_get_bb_reg(dev, rCCK0_TxFilter1, bMaskByte2);
                for (i = 0; i < CCK_Table_length; i++) {
                        if (TempCCk == (u32)CCKSwingTable_Ch1_Ch13[i][0]) {
                                priv->CCK_index = (u8) i;
@@ -1279,12 +1279,12 @@ static void dm_bb_initialgain_backup(struct net_device *dev)
                return;
 
        rtl8192_setBBreg(dev, UFWP, bMaskByte1, 0x8);
-       priv->initgain_backup.xaagccore1 = (u8)rtl8192_QueryBBReg(dev, rOFDM0_XAAGCCore1, bit_mask);
-       priv->initgain_backup.xbagccore1 = (u8)rtl8192_QueryBBReg(dev, rOFDM0_XBAGCCore1, bit_mask);
-       priv->initgain_backup.xcagccore1 = (u8)rtl8192_QueryBBReg(dev, rOFDM0_XCAGCCore1, bit_mask);
-       priv->initgain_backup.xdagccore1 = (u8)rtl8192_QueryBBReg(dev, rOFDM0_XDAGCCore1, bit_mask);
+       priv->initgain_backup.xaagccore1 = (u8)rtl92e_get_bb_reg(dev, rOFDM0_XAAGCCore1, bit_mask);
+       priv->initgain_backup.xbagccore1 = (u8)rtl92e_get_bb_reg(dev, rOFDM0_XBAGCCore1, bit_mask);
+       priv->initgain_backup.xcagccore1 = (u8)rtl92e_get_bb_reg(dev, rOFDM0_XCAGCCore1, bit_mask);
+       priv->initgain_backup.xdagccore1 = (u8)rtl92e_get_bb_reg(dev, rOFDM0_XDAGCCore1, bit_mask);
        bit_mask  = bMaskByte2;
-       priv->initgain_backup.cca = (u8)rtl8192_QueryBBReg(dev, rCCK0_CCA, bit_mask);
+       priv->initgain_backup.cca = (u8)rtl92e_get_bb_reg(dev, rCCK0_CCA, bit_mask);
 
        RT_TRACE(COMP_DIG, "BBInitialGainBackup 0xc50 is %x\n",
                 priv->initgain_backup.xaagccore1);