Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1228950

[PATCH 9/9] staging: rtl8192e: Merge/Remove _rtl92e_dm_bb_initialgain_backup

Show all headers | View raw

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 <mateusz.kulikowski@gmail.com>
---
 drivers/staging/rtl8192e/rtl8192e/rtl_dm.c | 14 +-------------
 1 file changed, 1 insertion(+), 13 deletions(-)

diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c b/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c
index c5068dd..efa57d8 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)
-- 
1.8.4.1

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH 0/9] staging: rtl8192e: Various cleanups Mateusz Kulikowski <mateusz.kulikowski@gmail.com> - 2015-09-20 21:10 +0200
  [PATCH 5/9] staging: rtl8192e: Remove _rtl92e_silent_reset_mesh Mateusz Kulikowski <mateusz.kulikowski@gmail.com> - 2015-09-20 21:10 +0200
  [PATCH 6/9] staging: rtl8192e: Remove _rtl92e_dm_check_pbc_gpio Mateusz Kulikowski <mateusz.kulikowski@gmail.com> - 2015-09-20 21:10 +0200
  [PATCH 9/9] staging: rtl8192e: Merge/Remove _rtl92e_dm_bb_initialgain_backup Mateusz Kulikowski <mateusz.kulikowski@gmail.com> - 2015-09-20 21:10 +0200
  [PATCH 8/9] staging: rtl8192e: Simplify _rtl92e_calculate_bit_shift Mateusz Kulikowski <mateusz.kulikowski@gmail.com> - 2015-09-20 21:10 +0200
  [PATCH 1/9] staging: rtl8192e: rtl_wx: Fix BRACES warning Mateusz Kulikowski <mateusz.kulikowski@gmail.com> - 2015-09-20 21:10 +0200
  [PATCH 4/9] staging: rtl8192e: Fix FSF_MAILING_ADDRESS warnings Mateusz Kulikowski <mateusz.kulikowski@gmail.com> - 2015-09-20 21:10 +0200

csiph-web