From: Mateusz Kulikowski Date: Sun, 20 Sep 2015 08:19:44 +0000 (+0200) Subject: staging: rtl8192e: Rename dm_ctrl_initgain_byrssi_by_fwfalse_alarm X-Git-Tag: firefly_0821_release~176^2~802^2~1549 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=7249a4b5118ab693d6e871fcea8edbdaeddfa3c5;p=firefly-linux-kernel-4.4.55.git staging: rtl8192e: Rename dm_ctrl_initgain_byrssi_by_fwfalse_alarm Use naming schema found in other rtlwifi devices. Rename dm_ctrl_initgain_byrssi_by_fwfalse_alarm to _rtl92e_dm_ctrl_initgain_byrssi_false_alarm. 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 26a61f38166a..2df6344fae22 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c @@ -181,7 +181,7 @@ static void dm_dig_init(struct net_device *dev); static void dm_ctrl_initgain_byrssi(struct net_device *dev); static void dm_ctrl_initgain_byrssi_highpwr(struct net_device *dev); static void _rtl92e_dm_ctrl_initgain_byrssi_driver(struct net_device *dev); -static void dm_ctrl_initgain_byrssi_by_fwfalse_alarm(struct net_device *dev); +static void _rtl92e_dm_ctrl_initgain_byrssi_false_alarm(struct net_device *dev); static void dm_initial_gain(struct net_device *dev); static void dm_pd_th(struct net_device *dev); static void _rtl92e_dm_cs_ratio(struct net_device *dev); @@ -1329,7 +1329,7 @@ static void dm_ctrl_initgain_byrssi(struct net_device *dev) return; if (dm_digtable.dig_algorithm == DIG_ALGO_BY_FALSE_ALARM) - dm_ctrl_initgain_byrssi_by_fwfalse_alarm(dev); + _rtl92e_dm_ctrl_initgain_byrssi_false_alarm(dev); else if (dm_digtable.dig_algorithm == DIG_ALGO_BY_RSSI) _rtl92e_dm_ctrl_initgain_byrssi_driver(dev); else @@ -1388,8 +1388,7 @@ static void _rtl92e_dm_ctrl_initgain_byrssi_driver(struct net_device *dev) } -static void dm_ctrl_initgain_byrssi_by_fwfalse_alarm( - struct net_device *dev) +static void _rtl92e_dm_ctrl_initgain_byrssi_false_alarm(struct net_device *dev) { struct r8192_priv *priv = rtllib_priv(dev); static u32 reset_cnt;