Commit d41df041 authored by Dr. David Alan Gilbert's avatar Dr. David Alan Gilbert Committed by Ping-Ke Shih
Browse files

wifi: rtlwifi: Remove some exhalbtc deadcode 



exhalbtc_rf_status_notify(), exhalbtc_coex_dm_switch() and
exhalbtc_antenna_detection() are unused since they were added in 2017's
commit 7937f02d ("rtlwifi: btcoex: hook external functions for newer
chips")

Remove them.

This leaves ex_btc8723b1ant_coex_dm_reset() unused.

Remove it.

exhalbtc_dbg_control(), exhalbtc_stack_update_profile_info(),
exhalbtc_set_hci_version(), and exhalbtc_set_bt_patch_version() are
unused since their addition in 2014 by
commit aa45a673 ("rtlwifi: btcoexist: Add new mini driver")

Remove them.

Signed-off-by: default avatarDr. David Alan Gilbert <linux@treblig.org>
Signed-off-by: default avatarPing-Ke Shih <pkshih@realtek.com>
Link: https://patch.msgid.link/20241104144331.29262-1-linux@treblig.org
parent 5c1b5445

drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8723b1ant.c

+0 −11
Original line number Diff line number Diff line
@@ -3409,17 +3409,6 @@ void ex_btc8723b1ant_pnp_notify(struct btc_coexist *btcoexist, u8 pnp_state) 
	}

}



void ex_btc8723b1ant_coex_dm_reset(struct btc_coexist *btcoexist)

{

	struct rtl_priv *rtlpriv = btcoexist->adapter;



	rtl_dbg(rtlpriv, COMP_BT_COEXIST, DBG_LOUD,

		"[BTCoex], *****************Coex DM Reset****************\n");



	halbtc8723b1ant_init_hw_config(btcoexist, false, false);

	halbtc8723b1ant_init_coex_dm(btcoexist);

}



void ex_btc8723b1ant_periodical(struct btc_coexist *btcoexist)

{

	struct rtl_priv *rtlpriv = btcoexist->adapter;

drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8723b1ant.h

+0 −1
Original line number Diff line number Diff line
@@ -197,7 +197,6 @@ void ex_btc8723b1ant_rf_status_notify(struct btc_coexist *btcoexist, 
				      u8 type);

void ex_btc8723b1ant_halt_notify(struct btc_coexist *btcoexist);

void ex_btc8723b1ant_pnp_notify(struct btc_coexist *btcoexist, u8 pnpstate);

void ex_btc8723b1ant_coex_dm_reset(struct btc_coexist *btcoexist);

void ex_btc8723b1ant_periodical(struct btc_coexist *btcoexist);

void ex_btc8723b1ant_display_coex_info(struct btc_coexist *btcoexist,

				       struct seq_file *m);

drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtcoutsrc.c

+0 −79
Original line number Diff line number Diff line
@@ -1708,19 +1708,6 @@ void exhalbtc_bt_info_notify(struct btc_coexist *btcoexist, 
	halbtc_normal_low_power(btcoexist);

}



void exhalbtc_rf_status_notify(struct btc_coexist *btcoexist, u8 type)

{

	if (!halbtc_is_bt_coexist_available(btcoexist))

		return;



	if (IS_HARDWARE_TYPE_8821(btcoexist->adapter)) {

	} else if (IS_HARDWARE_TYPE_8723B(btcoexist->adapter)) {

		if (btcoexist->board_info.btdm_ant_num == 1)

			ex_btc8723b1ant_rf_status_notify(btcoexist, type);

	} else if (IS_HARDWARE_TYPE_8192E(btcoexist->adapter)) {

	}

}



void exhalbtc_halt_notify(struct btc_coexist *btcoexist)

{

	if (!halbtc_is_bt_coexist_available(btcoexist))
@@ -1768,31 +1755,6 @@ void exhalbtc_pnp_notify(struct btc_coexist *btcoexist, u8 pnp_state) 
	}

}



void exhalbtc_coex_dm_switch(struct btc_coexist *btcoexist)

{

	struct rtl_priv *rtlpriv = btcoexist->adapter;



	if (!halbtc_is_bt_coexist_available(btcoexist))

		return;

	btcoexist->statistics.cnt_coex_dm_switch++;



	halbtc_leave_low_power(btcoexist);



	if (IS_HARDWARE_TYPE_8723B(btcoexist->adapter)) {

		if (btcoexist->board_info.btdm_ant_num == 1) {

			btcoexist->stop_coex_dm = true;

			ex_btc8723b1ant_coex_dm_reset(btcoexist);

			exhalbtc_set_ant_num(rtlpriv,

					     BT_COEX_ANT_TYPE_DETECTED, 2);

			ex_btc8723b2ant_init_hwconfig(btcoexist);

			ex_btc8723b2ant_init_coex_dm(btcoexist);

			btcoexist->stop_coex_dm = false;

		}

	}



	halbtc_normal_low_power(btcoexist);

}



void exhalbtc_periodical(struct btc_coexist *btcoexist)

{

	if (!halbtc_is_bt_coexist_available(btcoexist))
@@ -1820,29 +1782,6 @@ void exhalbtc_periodical(struct btc_coexist *btcoexist) 
	halbtc_normal_low_power(btcoexist);

}



void exhalbtc_dbg_control(struct btc_coexist *btcoexist,

			  u8 code, u8 len, u8 *data)

{

	if (!halbtc_is_bt_coexist_available(btcoexist))

		return;

	btcoexist->statistics.cnt_dbg_ctrl++;



	halbtc_leave_low_power(btcoexist);



	halbtc_normal_low_power(btcoexist);

}



void exhalbtc_antenna_detection(struct btc_coexist *btcoexist, u32 cent_freq,

				u32 offset, u32 span, u32 seconds)

{

	if (!halbtc_is_bt_coexist_available(btcoexist))

		return;

}



void exhalbtc_stack_update_profile_info(void)

{

}



void exhalbtc_update_min_bt_rssi(struct btc_coexist *btcoexist, s8 bt_rssi)

{

	if (!halbtc_is_bt_coexist_available(btcoexist))
@@ -1851,24 +1790,6 @@ void exhalbtc_update_min_bt_rssi(struct btc_coexist *btcoexist, s8 bt_rssi) 
	btcoexist->stack_info.min_bt_rssi = bt_rssi;

}



void exhalbtc_set_hci_version(struct btc_coexist *btcoexist, u16 hci_version)

{

	if (!halbtc_is_bt_coexist_available(btcoexist))

		return;



	btcoexist->stack_info.hci_version = hci_version;

}



void exhalbtc_set_bt_patch_version(struct btc_coexist *btcoexist,

				   u16 bt_hci_version, u16 bt_patch_version)

{

	if (!halbtc_is_bt_coexist_available(btcoexist))

		return;



	btcoexist->bt_info.bt_real_fw_ver = bt_patch_version;

	btcoexist->bt_info.bt_hci_ver = bt_hci_version;

}



void exhalbtc_set_chip_type(struct btc_coexist *btcoexist, u8 chip_type)

{

	switch (chip_type) {

drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtcoutsrc.h

+0 −10
Original line number Diff line number Diff line
@@ -763,19 +763,9 @@ void exhalbtc_mediastatus_notify(struct btc_coexist *btcoexist, 
void exhalbtc_special_packet_notify(struct btc_coexist *btcoexist, u8 pkt_type);

void exhalbtc_bt_info_notify(struct btc_coexist *btcoexist, u8 *tmp_buf,

			     u8 length);

void exhalbtc_rf_status_notify(struct btc_coexist *btcoexist, u8 type);

void exhalbtc_halt_notify(struct btc_coexist *btcoexist);

void exhalbtc_pnp_notify(struct btc_coexist *btcoexist, u8 pnp_state);

void exhalbtc_coex_dm_switch(struct btc_coexist *btcoexist);

void exhalbtc_periodical(struct btc_coexist *btcoexist);

void exhalbtc_dbg_control(struct btc_coexist *btcoexist, u8 code, u8 len,

			  u8 *data);

void exhalbtc_antenna_detection(struct btc_coexist *btcoexist, u32 cent_freq,

				u32 offset, u32 span, u32 seconds);

void exhalbtc_stack_update_profile_info(void);

void exhalbtc_set_hci_version(struct btc_coexist *btcoexist, u16 hci_version);

void exhalbtc_set_bt_patch_version(struct btc_coexist *btcoexist,

				   u16 bt_hci_version, u16 bt_patch_version);

void exhalbtc_update_min_bt_rssi(struct btc_coexist *btcoexist, s8 bt_rssi);

void exhalbtc_set_bt_exist(struct btc_coexist *btcoexist, bool bt_exist);

void exhalbtc_set_chip_type(struct btc_coexist *btcoexist, u8 chip_type);