From: Mateusz Kulikowski Date: Sun, 20 Sep 2015 08:20:07 +0000 (+0200) Subject: staging: rtl8192e: Rename dm_txpower_reset_recovery X-Git-Tag: firefly_0821_release~176^2~802^2~1526 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=1b97c2206474ca5dd7dad7cf40ea259d3d7489c2;p=firefly-linux-kernel-4.4.55.git staging: rtl8192e: Rename dm_txpower_reset_recovery Use naming schema found in other rtlwifi devices. Rename dm_txpower_reset_recovery to _rtl92e_dm_tx_power_reset_recovery. Signed-off-by: Mateusz Kulikowski Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c b/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c index 3576ae1d097a..cac70c2010a4 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c @@ -1154,7 +1154,7 @@ void rtl92e_dm_cck_txpower_adjust(struct net_device *dev, bool binch14) _rtl92e_dm_cck_tx_power_adjust_thermal_meter(dev, binch14); } -static void dm_txpower_reset_recovery(struct net_device *dev) +static void _rtl92e_dm_tx_power_reset_recovery(struct net_device *dev) { struct r8192_priv *priv = rtllib_priv(dev); @@ -1209,7 +1209,7 @@ void rtl92e_dm_restore_state(struct net_device *dev) rtl92e_writel(dev, RATR0, ratr_value); rtl92e_writeb(dev, UFWP, 1); if (priv->btxpower_trackingInit && priv->btxpower_tracking) - dm_txpower_reset_recovery(dev); + _rtl92e_dm_tx_power_reset_recovery(dev); _rtl92e_dm_bb_initialgain_restore(dev);