openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

rtlwifi: remove duplicate definition of antenna number for btcoex 

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

Signed-off-by: Ping-Ke Shih <pkshih@realtek.com>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
This commit is contained in:
Ping-Ke Shih 2018-05-04 10:42:04 +08:00 committed by Kalle Valo
parent c990affd5a
commit bf516e7d8b
2 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/net/wireless/realtek/rtlwifi/rtl8192ee/hw.c
View File

@ -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.btcoexist = 0;
rtlpriv->btcoexist.btc_info.bt_type = BT_RTL8192E; 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 { } else {
rtlpriv->btcoexist.btc_info.btcoexist = 1; rtlpriv->btcoexist.btc_info.btcoexist = 1;
rtlpriv->btcoexist.btc_info.bt_type = BT_RTL8192E; 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;
} }
} }

5
drivers/net/wireless/realtek/rtlwifi/wifi.h
View File

@ -2842,11 +2842,6 @@ enum bt_co_type {
BT_RTL8812A = 11, BT_RTL8812A = 11,
}; };
enum bt_total_ant_num {
ANT_TOTAL_X2 = 0,
ANT_TOTAL_X1 = 1
};
enum bt_cur_state { enum bt_cur_state {
BT_OFF = 0, BT_OFF = 0,
BT_ON = 1, BT_ON = 1,