staging: rtl8192e: Rename rtl8192_phy_SetRFReg

Use naming schema found in other rtlwifi devices.
Rename rtl8192_phy_SetRFReg to rtl92e_set_rf_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 510dfb22949eee29ea267187ddf18520538391c2..92bac867f832be01358ecc3f10a693ca6f706d57 100644 (file)
--- a/drivers/staging/rtl8192e/rtl8192e/r8190P_rtl8256.c
+++ b/drivers/staging/rtl8192e/rtl8192e/r8190P_rtl8256.c
@@ -36,15 +36,15 @@ void rtl92e_set_bandwidth(struct net_device *dev,
                case HT_CHANNEL_WIDTH_20:
                        if (priv->card_8192_version == VERSION_8190_BD ||
                            priv->card_8192_version == VERSION_8190_BE) {
-                               rtl8192_phy_SetRFReg(dev,
-                                               (enum rf90_radio_path)eRFPath,
-                                               0x0b, bMask12Bits, 0x100);
-                               rtl8192_phy_SetRFReg(dev,
-                                               (enum rf90_radio_path)eRFPath,
-                                               0x2c, bMask12Bits, 0x3d7);
-                               rtl8192_phy_SetRFReg(dev,
-                                               (enum rf90_radio_path)eRFPath,
-                                               0x0e, bMask12Bits, 0x021);
+                               rtl92e_set_rf_reg(dev,
+                                                 (enum rf90_radio_path)eRFPath,
+                                                 0x0b, bMask12Bits, 0x100);
+                               rtl92e_set_rf_reg(dev,
+                                                 (enum rf90_radio_path)eRFPath,
+                                                 0x2c, bMask12Bits, 0x3d7);
+                               rtl92e_set_rf_reg(dev,
+                                                 (enum rf90_radio_path)eRFPath,
+                                                 0x0e, bMask12Bits, 0x021);
 
                        } else {
                                netdev_warn(dev, "%s(): Unknown HW version.\n",
@@ -55,15 +55,15 @@ void rtl92e_set_bandwidth(struct net_device *dev,
                case HT_CHANNEL_WIDTH_20_40:
                        if (priv->card_8192_version == VERSION_8190_BD ||
                            priv->card_8192_version == VERSION_8190_BE) {
-                               rtl8192_phy_SetRFReg(dev,
-                                                (enum rf90_radio_path)eRFPath,
-                                                0x0b, bMask12Bits, 0x300);
-                               rtl8192_phy_SetRFReg(dev,
-                                                (enum rf90_radio_path)eRFPath,
-                                                0x2c, bMask12Bits, 0x3ff);
-                               rtl8192_phy_SetRFReg(dev,
-                                                (enum rf90_radio_path)eRFPath,
-                                                0x0e, bMask12Bits, 0x0e1);
+                               rtl92e_set_rf_reg(dev,
+                                                 (enum rf90_radio_path)eRFPath,
+                                                 0x0b, bMask12Bits, 0x300);
+                               rtl92e_set_rf_reg(dev,
+                                                 (enum rf90_radio_path)eRFPath,
+                                                 0x2c, bMask12Bits, 0x3ff);
+                               rtl92e_set_rf_reg(dev,
+                                                 (enum rf90_radio_path)eRFPath,
+                                                 0x0e, bMask12Bits, 0x0e1);
 
                        } else {
                                netdev_warn(dev, "%s(): Unknown HW version.\n",
@@ -124,8 +124,8 @@ static bool phy_RF8256_Config_ParaFile(struct net_device *dev)
                rtl8192_setBBreg(dev, pPhyReg->rfHSSIPara2,
                                 b3WireDataLength, 0x0);
 
-               rtl8192_phy_SetRFReg(dev, (enum rf90_radio_path) eRFPath, 0x0,
-                                    bMask12Bits, 0xbf);
+               rtl92e_set_rf_reg(dev, (enum rf90_radio_path)eRFPath, 0x0,
+                                 bMask12Bits, 0xbf);
 
                rtStatus = rtl92e_check_bb_and_rf(dev, HW90_BLOCK_RF,
                                                  (enum rf90_radio_path)eRFPath);

diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c b/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c
index 19d954781385b8cc523f921e449e48a3768950b8..6ddbbfc29f4f250fb10fd5ea0ef3110dbff1b624 100644 (file)
--- a/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c
+++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c
@@ -216,8 +216,8 @@ static void rtl8192_phy_RFSerialWrite(struct net_device *dev,
        }
 }
 
-void rtl8192_phy_SetRFReg(struct net_device *dev, enum rf90_radio_path eRFPath,
-                         u32 RegAddr, u32 BitMask, u32 Data)
+void rtl92e_set_rf_reg(struct net_device *dev, enum rf90_radio_path eRFPath,
+                      u32 RegAddr, u32 BitMask, u32 Data)
 {
        struct r8192_priv *priv = rtllib_priv(dev);
        u32 Original_Value, BitShift, New_Value;
@@ -521,9 +521,9 @@ bool rtl92e_check_bb_and_rf(struct net_device *dev, enum hw90_block CheckBlock,
 
                case HW90_BLOCK_RF:
                        WriteData[i] &= 0xfff;
-                       rtl8192_phy_SetRFReg(dev, eRFPath,
-                                                WriteAddr[HW90_BLOCK_RF],
-                                                bMask12Bits, WriteData[i]);
+                       rtl92e_set_rf_reg(dev, eRFPath,
+                                         WriteAddr[HW90_BLOCK_RF],
+                                         bMask12Bits, WriteData[i]);
                        mdelay(10);
                        dwRegRead = rtl92e_get_rf_reg(dev, eRFPath,
                                                      WriteAddr[HW90_BLOCK_RF],
@@ -729,10 +729,9 @@ u8 rtl92e_config_rf_path(struct net_device *dev, enum rf90_radio_path eRFPath)
                                msleep(100);
                                continue;
                        }
-                       rtl8192_phy_SetRFReg(dev, eRFPath,
-                                            Rtl819XRadioA_Array[i],
-                                            bMask12Bits,
-                                            Rtl819XRadioA_Array[i+1]);
+                       rtl92e_set_rf_reg(dev, eRFPath, Rtl819XRadioA_Array[i],
+                                         bMask12Bits,
+                                         Rtl819XRadioA_Array[i+1]);
 
                }
                break;
@@ -742,10 +741,9 @@ u8 rtl92e_config_rf_path(struct net_device *dev, enum rf90_radio_path eRFPath)
                                msleep(100);
                                continue;
                        }
-                       rtl8192_phy_SetRFReg(dev, eRFPath,
-                                            Rtl819XRadioB_Array[i],
-                                            bMask12Bits,
-                                            Rtl819XRadioB_Array[i+1]);
+                       rtl92e_set_rf_reg(dev, eRFPath, Rtl819XRadioB_Array[i],
+                                         bMask12Bits,
+                                         Rtl819XRadioB_Array[i+1]);
 
                }
                break;
@@ -755,10 +753,9 @@ u8 rtl92e_config_rf_path(struct net_device *dev, enum rf90_radio_path eRFPath)
                                msleep(100);
                                continue;
                        }
-                       rtl8192_phy_SetRFReg(dev, eRFPath,
-                                            Rtl819XRadioC_Array[i],
-                                            bMask12Bits,
-                                            Rtl819XRadioC_Array[i+1]);
+                       rtl92e_set_rf_reg(dev, eRFPath, Rtl819XRadioC_Array[i],
+                                         bMask12Bits,
+                                         Rtl819XRadioC_Array[i+1]);
 
                }
                break;
@@ -768,9 +765,9 @@ u8 rtl92e_config_rf_path(struct net_device *dev, enum rf90_radio_path eRFPath)
                                        msleep(100);
                                        continue;
                        }
-                       rtl8192_phy_SetRFReg(dev, eRFPath,
-                                        Rtl819XRadioD_Array[i], bMask12Bits,
-                                        Rtl819XRadioD_Array[i+1]);
+                       rtl92e_set_rf_reg(dev, eRFPath, Rtl819XRadioD_Array[i],
+                                         bMask12Bits,
+                                         Rtl819XRadioD_Array[i+1]);
 
                }
                break;
@@ -953,7 +950,7 @@ static u8 rtl8192_phy_SwChnlStepByStep(struct net_device *dev, u8 channel,
                        case CmdID_RF_WriteReg:
                                for (eRFPath = 0; eRFPath <
                                     priv->NumTotalRFPath; eRFPath++)
-                                       rtl8192_phy_SetRFReg(dev,
+                                       rtl92e_set_rf_reg(dev,
                                                 (enum rf90_radio_path)eRFPath,
                                                 CurrentCmd->Para1, bMask12Bits,
                                                 CurrentCmd->Para2<<7);

diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.h b/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.h
index 66a2f2f456715023a65c3ee828a3bc12c97a759b..33aa78a375d9b42045f17ecfe5ec1d324b3b3a2b 100644 (file)
--- a/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.h
+++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.h
@@ -72,9 +72,9 @@ 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 void rtl8192_phy_SetRFReg(struct net_device *dev,
-                                enum rf90_radio_path eRFPath,
-                                u32 RegAddr, u32 BitMask, u32 Data);
+extern void rtl92e_set_rf_reg(struct net_device *dev,
+                             enum rf90_radio_path eRFPath, u32 RegAddr,
+                             u32 BitMask, u32 Data);
 extern u32 rtl92e_get_rf_reg(struct net_device *dev,
                             enum rf90_radio_path eRFPath, u32 RegAddr,
                             u32 BitMask);

diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c b/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c
index 54ec25f5d16d223cb501c07d42549d122a4ca44f..de085477f2f6f55530bfa95255cd17e46fe7e5d2 100644 (file)
--- a/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c
+++ b/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c
@@ -1038,10 +1038,10 @@ static void dm_CheckTXPowerTracking_ThermalMeter(struct net_device *dev)
 
        if (!TM_Trigger) {
                {
-               rtl8192_phy_SetRFReg(dev, RF90_PATH_A, 0x02, bMask12Bits, 0x4d);
-               rtl8192_phy_SetRFReg(dev, RF90_PATH_A, 0x02, bMask12Bits, 0x4f);
-               rtl8192_phy_SetRFReg(dev, RF90_PATH_A, 0x02, bMask12Bits, 0x4d);
-               rtl8192_phy_SetRFReg(dev, RF90_PATH_A, 0x02, bMask12Bits, 0x4f);
+               rtl92e_set_rf_reg(dev, RF90_PATH_A, 0x02, bMask12Bits, 0x4d);
+               rtl92e_set_rf_reg(dev, RF90_PATH_A, 0x02, bMask12Bits, 0x4f);
+               rtl92e_set_rf_reg(dev, RF90_PATH_A, 0x02, bMask12Bits, 0x4d);
+               rtl92e_set_rf_reg(dev, RF90_PATH_A, 0x02, bMask12Bits, 0x4f);
                }
                TM_Trigger = 1;
                return;