rtlwifi: remove duplicate definition of antenna number for btcoex

Ping-Ke Shih · Kalle Valo · commit bf516e7d8b1c · 2018-05-09T13:23:00.000+03:00
Two enumerations bt_total_ant_num and bt_ant_num are identical, so one
can be removed.

Signed-off-by: Ping-Ke Shih &lt;pkshih@realtek.com&gt;
Signed-off-by: Kalle Valo &lt;kvalo@codeaurora.org&gt;
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8192ee/hw.c b/drivers/net/wireless/realtek/rtlwifi/rtl8192ee/hw.c
@@ -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;
 	}
 }
 
diff --git a/drivers/net/wireless/realtek/rtlwifi/wifi.h b/drivers/net/wireless/realtek/rtlwifi/wifi.h
@@ -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,

Original file line number	Diff line number	Diff line change
`@@ -2574,11 +2574,11 @@ void rtl92ee_read_bt_coexist_info_from_hwpg(struct ieee80211_hw *hw,`
`2574`	`2574`	`rtlpriv->btcoexist.btc_info.btcoexist = 0;`
`2575`	`2575`
`2576`	`2576`	`rtlpriv->btcoexist.btc_info.bt_type = BT_RTL8192E;`
`2577`		`- rtlpriv->btcoexist.btc_info.ant_num = ANT_TOTAL_X2;`
	`2577`	`+ rtlpriv->btcoexist.btc_info.ant_num = ANT_X2;`
`2578`	`2578`	`} else {`
`2579`	`2579`	`rtlpriv->btcoexist.btc_info.btcoexist = 1;`
`2580`	`2580`	`rtlpriv->btcoexist.btc_info.bt_type = BT_RTL8192E;`
`2581`		`- rtlpriv->btcoexist.btc_info.ant_num = ANT_TOTAL_X1;`
	`2581`	`+ rtlpriv->btcoexist.btc_info.ant_num = ANT_X1;`
`2582`	`2582`	`}`
`2583`	`2583`	`}`
`2584`	`2584`