rtlwifi: remove duplicate definition of antenna number for btcoex

PATCH In review [email protected] 2 participants 2 messages May 4, 2018 – May 9, 2018 Realtek wireless driver (rtlwifi family)

lore

Share & tools

lore

[email protected]

author maintainer

2018-05-04 02:42 UTC #0 lore raw

PATCH 1/1 rtlwifi: remove duplicate definition of antenna number for btcoex

From: Ping-Ke Shih <[email protected]>

Two enumerations bt_total_ant_num and bt_ant_num are identical, so one can be removed.

Signed-off-by Ping-Ke Shih <[email protected]>

---
 drivers/net/wireless/realtek/rtlwifi/rtl8192ee/hw.c | 4 ++--
 drivers/net/wireless/realtek/rtlwifi/wifi.h         | 5 -----
 2 files changed, 2 insertions(+), 7 deletions(-)

drivers/net/wireless/realtek/rtlwifi/rtl8192ee/hw.c +2 -2

index fd7928fdbd1a..3f2295fdb02d 100644
@@ -2574,11 +2574,11 @@ void rtl92ee_read_bt_coexist_info_from_hwpg(struct ieee80211_hw *hw,
 			rtlpriv->btcoexist.btc_info.btcoexist = 0;
 
 		rtlpriv->btcoexist.btc_info.bt_type = BT_RTL8192E;
-		rtlpriv->btcoexist.btc_info.ant_num = ANT_TOTAL_X2;
+		rtlpriv->btcoexist.btc_info.ant_num = ANT_X2;
 	} else {
 		rtlpriv->btcoexist.btc_info.btcoexist = 1;
 		rtlpriv->btcoexist.btc_info.bt_type = BT_RTL8192E;
-		rtlpriv->btcoexist.btc_info.ant_num = ANT_TOTAL_X1;
+		rtlpriv->btcoexist.btc_info.ant_num = ANT_X1;
 	}
 }

drivers/net/wireless/realtek/rtlwifi/wifi.h +0 -5

index ce1754054a07..208010fcde21 100644
@@ -2842,11 +2842,6 @@ enum bt_co_type {
 	BT_RTL8812A = 11,
 };
 
-enum bt_total_ant_num {
-	ANT_TOTAL_X2 = 0,
-	ANT_TOTAL_X1 = 1
-};
-
 enum bt_cur_state {
 	BT_OFF = 0,
 	BT_ON = 1,

Signature · 1 line

2.15.1

Kalle Valo

2018-05-09 10:24 UTC #1 lore raw

Quoted 6 lines · Ping-Ke Shih

From: Ping-Ke Shih <[email protected]>
Two enumerations bt_total_ant_num and bt_ant_num are identical, so one can be removed.
Signed-off-by Ping-Ke Shih <[email protected]>

Patch applied to wireless-drivers-next.git, thanks.

bf516e7d8b1c rtlwifi: remove duplicate definition of antenna number for btcoex

Signature · 3 lines

https://patchwork.kernel.org/patch/10379701/

https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches