diff options
| author | Mateusz Kulikowski <mateusz.kulikowski@gmail.com> | 2015-07-19 20:28:34 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-07-23 07:26:23 +0300 |
| commit | 25c01ec36eafb4096edaae0607b0dc7e4762cb38 (patch) | |
| tree | 08acfca27591edeb2eb8809c38a90942a99abee9 | |
| parent | 5a9f18cfeda0b73d2fafdab6eb1c4457ddd34b76 (diff) | |
| download | linux-25c01ec36eafb4096edaae0607b0dc7e4762cb38.tar.xz | |
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>
| -rw-r--r-- | drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 2 | ||||
| -rw-r--r-- | drivers/staging/rtl8192e/rtl8192e/rtl_dm.c | 4 | ||||
| -rw-r--r-- | drivers/staging/rtl8192e/rtl8192e/rtl_dm.h | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c index ae8a82066f32..bdbd4bef606e 100644 --- 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 c96ab6ee1a14..fbbeca11a7d3 100644 --- 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 0b9f0852dce7..7904a11acab5 100644 --- 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); |