staging: rtl8192e: Rename dm_cck_txpower_adjust

Use naming schema found in other rtlwifi devices.
Rename dm_cck_txpower_adjust to rtl92e_dm_cck_txpower_adjust.

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/r8192E_phy.c b/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c
index 674c529df4a4d96c073dedab61612d43c409c819..7acae7d49c91b90e1ae13f6587bf65c20432d045 100644 (file)
--- a/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c
+++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c
@@ -1076,13 +1076,13 @@ static void CCK_Tx_Power_Track_BW_Switch_TSSI(struct net_device *dev)
                if (priv->rtllib->current_network.channel == 14 &&
                    !priv->bcck_in_ch14) {
                        priv->bcck_in_ch14 = true;
-                       dm_cck_txpower_adjust(dev, priv->bcck_in_ch14);
+                       rtl92e_dm_cck_txpower_adjust(dev, priv->bcck_in_ch14);
                } else if (priv->rtllib->current_network.channel !=
                           14 && priv->bcck_in_ch14) {
                        priv->bcck_in_ch14 = false;
-                       dm_cck_txpower_adjust(dev, priv->bcck_in_ch14);
+                       rtl92e_dm_cck_txpower_adjust(dev, priv->bcck_in_ch14);
                } else {
-                       dm_cck_txpower_adjust(dev, priv->bcck_in_ch14);
+                       rtl92e_dm_cck_txpower_adjust(dev, priv->bcck_in_ch14);
                }
                break;
 
@@ -1104,13 +1104,13 @@ static void CCK_Tx_Power_Track_BW_Switch_TSSI(struct net_device *dev)
                if (priv->rtllib->current_network.channel == 14 &&
                    !priv->bcck_in_ch14) {
                        priv->bcck_in_ch14 = true;
-                       dm_cck_txpower_adjust(dev, priv->bcck_in_ch14);
+                       rtl92e_dm_cck_txpower_adjust(dev, priv->bcck_in_ch14);
                } else if (priv->rtllib->current_network.channel != 14
                           && priv->bcck_in_ch14) {
                        priv->bcck_in_ch14 = false;
-                       dm_cck_txpower_adjust(dev, priv->bcck_in_ch14);
+                       rtl92e_dm_cck_txpower_adjust(dev, priv->bcck_in_ch14);
                } else {
-                       dm_cck_txpower_adjust(dev, priv->bcck_in_ch14);
+                       rtl92e_dm_cck_txpower_adjust(dev, priv->bcck_in_ch14);
                }
                break;
        }
@@ -1144,7 +1144,7 @@ static void CCK_Tx_Power_Track_BW_Switch_ThermalMeter(struct net_device *dev)
                         priv->CCK_index);
        break;
        }
-       dm_cck_txpower_adjust(dev, priv->bcck_in_ch14);
+       rtl92e_dm_cck_txpower_adjust(dev, priv->bcck_in_ch14);
 }
 
 static void CCK_Tx_Power_Track_BW_Switch(struct net_device *dev)

diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c b/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c
index 848d6ee74962cdde3242992705329543bcbe127e..c947b62a17325a7d3426f67f93cdad389cd2ef5a 100644 (file)
--- a/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c
+++ b/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c
@@ -802,12 +802,12 @@ static void dm_TXPowerTrackingCallback_TSSI(struct net_device *dev)
                                if (priv->rtllib->current_network.channel == 14 &&
                                    !priv->bcck_in_ch14) {
                                        priv->bcck_in_ch14 = true;
-                                       dm_cck_txpower_adjust(dev, priv->bcck_in_ch14);
+                                       rtl92e_dm_cck_txpower_adjust(dev, priv->bcck_in_ch14);
                                } else if (priv->rtllib->current_network.channel != 14 && priv->bcck_in_ch14) {
                                        priv->bcck_in_ch14 = false;
-                                       dm_cck_txpower_adjust(dev, priv->bcck_in_ch14);
+                                       rtl92e_dm_cck_txpower_adjust(dev, priv->bcck_in_ch14);
                                } else
-                                       dm_cck_txpower_adjust(dev, priv->bcck_in_ch14);
+                                       rtl92e_dm_cck_txpower_adjust(dev, priv->bcck_in_ch14);
                        }
                        RT_TRACE(COMP_POWER_TRACKING,
                                 "priv->rfa_txpowertrackingindex = %d\n",
@@ -935,7 +935,7 @@ static void dm_TXPowerTrackingCallback_ThermalMeter(struct net_device *dev)
        }
 
        if (CCKSwingNeedUpdate)
-               dm_cck_txpower_adjust(dev, priv->bcck_in_ch14);
+               rtl92e_dm_cck_txpower_adjust(dev, priv->bcck_in_ch14);
        if (priv->OFDM_index[0] != tmpOFDMindex) {
                priv->OFDM_index[0] = tmpOFDMindex;
                rtl92e_set_bb_reg(dev, rOFDM0_XATxIQImbalance, bMaskDWord,
@@ -1149,7 +1149,7 @@ static void dm_CCKTxPowerAdjust_ThermalMeter(struct net_device *dev,
        }
 }
 
-void dm_cck_txpower_adjust(struct net_device *dev, bool  binch14)
+void rtl92e_dm_cck_txpower_adjust(struct net_device *dev, bool binch14)
 {
        struct r8192_priv *priv = rtllib_priv(dev);
 
@@ -1177,7 +1177,7 @@ static void dm_txpower_reset_recovery(struct net_device *dev)
        RT_TRACE(COMP_POWER_TRACKING,
                 "Reset Recovery: CCK Attenuation is %d dB\n",
                 priv->CCKPresentAttentuation);
-       dm_cck_txpower_adjust(dev, priv->bcck_in_ch14);
+       rtl92e_dm_cck_txpower_adjust(dev, priv->bcck_in_ch14);
 
        rtl92e_set_bb_reg(dev, rOFDM0_XCTxIQImbalance, bMaskDWord,
                          dm_tx_bb_gain[priv->rfc_txpowertrackingindex]);

diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_dm.h b/drivers/staging/rtl8192e/rtl8192e/rtl_dm.h
index f138c90ccaa51c595bac72efd166df9128c4a8d0..f7e74825c7166123826eb3c3aa4b85db7ec11fde 100644 (file)
--- a/drivers/staging/rtl8192e/rtl8192e/rtl_dm.h
+++ b/drivers/staging/rtl8192e/rtl8192e/rtl_dm.h
@@ -197,7 +197,7 @@ extern void hal_dm_watchdog(struct net_device *dev);
 extern  void    init_rate_adaptive(struct net_device *dev);
 extern  void    dm_txpower_trackingcallback(void *data);
 
-extern  void dm_cck_txpower_adjust(struct net_device *dev, bool binch14);
+extern  void rtl92e_dm_cck_txpower_adjust(struct net_device *dev, bool binch14);
 
 extern  void    dm_restore_dynamic_mechanism_state(struct net_device *dev);
 extern  void    rtl92e_dm_backup_state(struct net_device *dev);