From: Mateusz Kulikowski Date: Sun, 20 Sep 2015 19:04:33 +0000 (+0200) Subject: staging: rtl8192e: Merge/Remove _rtl92e_dm_bb_initialgain_backup X-Git-Tag: firefly_0821_release~176^2~802^2~1425 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=0588da57c4b3afe99a70f5452d5e017e3d5e0d16;p=firefly-linux-kernel-4.4.55.git staging: rtl8192e: Merge/Remove _rtl92e_dm_bb_initialgain_backup Merge rtl92e_dm_backup_state and _rtl92e_dm_bb_initialgain_backup. Static function is called only once and dm_backup_state had short body. 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 c5068ddf2d07..efa57d814186 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c @@ -171,8 +171,6 @@ static void _rtl92e_dm_bandwidth_autoswitch(struct net_device *dev); static void _rtl92e_dm_check_tx_power_tracking(struct net_device *dev); static void _rtl92e_dm_bb_initialgain_restore(struct net_device *dev); -static void _rtl92e_dm_bb_initialgain_backup(struct net_device *dev); - static void _rtl92e_dm_dig_init(struct net_device *dev); static void _rtl92e_dm_ctrl_initgain_byrssi(struct net_device *dev); static void _rtl92e_dm_ctrl_initgain_byrssi_highpwr(struct net_device *dev); @@ -1242,22 +1240,13 @@ static void _rtl92e_dm_bb_initialgain_restore(struct net_device *dev) } - void rtl92e_dm_backup_state(struct net_device *dev) { struct r8192_priv *priv = rtllib_priv(dev); + u32 bit_mask = bMaskByte0; priv->bswitch_fsync = false; priv->bfsync_processing = false; - _rtl92e_dm_bb_initialgain_backup(dev); - -} - - -static void _rtl92e_dm_bb_initialgain_backup(struct net_device *dev) -{ - struct r8192_priv *priv = rtllib_priv(dev); - u32 bit_mask = bMaskByte0; if (dm_digtable.dig_algorithm == DIG_ALGO_BY_RSSI) return; @@ -1280,7 +1269,6 @@ static void _rtl92e_dm_bb_initialgain_backup(struct net_device *dev) priv->initgain_backup.xdagccore1); RT_TRACE(COMP_DIG, "BBInitialGainBackup 0xa0a is %x\n", priv->initgain_backup.cca); - } static void _rtl92e_dm_dig_init(struct net_device *dev)