staging: rtl8192e: Rename dm_restore_dynamic_mechanism_state

Use naming schema found in other rtlwifi devices.
Rename dm_restore_dynamic_mechanism_state to rtl92e_dm_restore_state.

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/rtl_core.c b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c
index ae8a82066f327ff772aff91429bd6c063f308688..bdbd4bef606e421b5e2afffe32c37fc57dac11cf 100644 (file)
--- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c
+++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c
@@ -1377,7 +1377,7 @@ RESET_START:
                }
 
                rtl92e_cam_restore(dev);
-               dm_restore_dynamic_mechanism_state(dev);
+               rtl92e_dm_restore_state(dev);
 END:
                priv->ResetProgress = RESET_TYPE_NORESET;
                priv->reset_count++;

diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c b/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c
index c96ab6ee1a140771ae8c3e79d04e2c47d2b65c72..fbbeca11a7d3177ae19b9ec6dd0fd1281b6d10be 100644 (file)
--- a/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c
+++ b/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c
@@ -1191,7 +1191,7 @@ static void dm_txpower_reset_recovery(struct net_device *dev)
                 dm_tx_bb_gain_idx_to_amplify(priv->rfc_txpowertrackingindex));
 }
 
-void dm_restore_dynamic_mechanism_state(struct net_device *dev)
+void rtl92e_dm_restore_state(struct net_device *dev)
 {
        struct r8192_priv *priv = rtllib_priv(dev);
        u32     reg_ratr = priv->rate_adaptive.last_ratr;
@@ -1199,7 +1199,7 @@ void dm_restore_dynamic_mechanism_state(struct net_device *dev)
 
        if (!priv->up) {
                RT_TRACE(COMP_RATE,
-                        "<---- dm_restore_dynamic_mechanism_state(): driver is going to unload\n");
+                        "<---- rtl92e_dm_restore_state(): driver is going to unload\n");
                return;
        }
 

diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_dm.h b/drivers/staging/rtl8192e/rtl8192e/rtl_dm.h
index 0b9f0852dce7ce9030d43a4025dbda978f23aa1a..7904a11acab50d1b00ca8c6f38b9c3595696ffcc 100644 (file)
--- a/drivers/staging/rtl8192e/rtl8192e/rtl_dm.h
+++ b/drivers/staging/rtl8192e/rtl8192e/rtl_dm.h
@@ -199,7 +199,7 @@ extern  void    dm_txpower_trackingcallback(void *data);
 
 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_restore_state(struct net_device *dev);
 extern  void    rtl92e_dm_backup_state(struct net_device *dev);
 extern  void    rtl92e_dm_init_edca_turbo(struct net_device *dev);
 extern  void    dm_rf_pathcheck_workitemcallback(void *data);