[PATCH 0/2] Realtek wifi deadcoding

[PATCH 0/2] Realtek wifi deadcoding

[linux]

From: "Dr. David Alan Gilbert" <linux@treblig.org>

Hi,
  This cleans up a bunch of unused functions.
I've split it, I think based on where they were added.

I'm also suspicious that exhalbtc_pre_load_firmware and
ex_btc8821a2ant_pre_load_firmware are unused, but commit 6fbbc82adfb2
makes a promising sounding reason why it's there - but I can't see
a use.  Anyone know why?  Anyway, I've left that for now.

Signed-off-by: Dr. David Alan Gilbert <linux@treblig.org>

Dave

Dr. David Alan Gilbert (2):
  rtlwifi: Remove unused functions
  rtlwifi: Remove more unused functions

 .../rtlwifi/btcoexist/halbtc8723b1ant.c       | 11 ---
 .../rtlwifi/btcoexist/halbtc8723b1ant.h       |  1 -
 .../realtek/rtlwifi/btcoexist/halbtcoutsrc.c  | 79 -------------------
 .../realtek/rtlwifi/btcoexist/halbtcoutsrc.h  | 10 ---
 4 files changed, 101 deletions(-)

-- 
2.47.0

[PATCH 1/2] rtlwifi: Remove unused functions

[linux]

From: "Dr. David Alan Gilbert" <linux@treblig.org>

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

Remove them.

This leaves ex_btc8723b1ant_coex_dm_reset() unused.

Remove it.

Signed-off-by: Dr. David Alan Gilbert <linux@treblig.org>
---
 .../rtlwifi/btcoexist/halbtc8723b1ant.c       | 11 -----
 .../rtlwifi/btcoexist/halbtc8723b1ant.h       |  1 -
 .../realtek/rtlwifi/btcoexist/halbtcoutsrc.c  | 45 -------------------
 .../realtek/rtlwifi/btcoexist/halbtcoutsrc.h  |  4 --
 4 files changed, 61 deletions(-)

diff --git a/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8723b1ant.c b/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8723b1ant.c
index 039bbedb41c2..379193b24428 100644
--- a/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8723b1ant.c
+++ b/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8723b1ant.c
@@ -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;
diff --git a/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8723b1ant.h b/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8723b1ant.h
index 9d41e11388ad..a4506d838dc7 100644
--- a/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8723b1ant.h
+++ b/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8723b1ant.h
@@ -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);
diff --git a/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtcoutsrc.c b/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtcoutsrc.c
index be4c0e60d44d..74c4504065c0 100644
--- a/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtcoutsrc.c
+++ b/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtcoutsrc.c
@@ -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))
@@ -1832,13 +1794,6 @@ void exhalbtc_dbg_control(struct btc_coexist *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)
 {
 }
diff --git a/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtcoutsrc.h b/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtcoutsrc.h
index a96a995dd850..5d146fcb7852 100644
--- a/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtcoutsrc.h
+++ b/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtcoutsrc.h
@@ -763,15 +763,11 @@ 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,
-- 
2.47.0

[PATCH 2/2] rtlwifi: Remove more unused functions

[linux]

From: "Dr. David Alan Gilbert" <linux@treblig.org>

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 aa45a673b291 ("rtlwifi: btcoexist: Add new mini driver")

Remove them.

Signed-off-by: Dr. David Alan Gilbert <linux@treblig.org>
---
 .../realtek/rtlwifi/btcoexist/halbtcoutsrc.c  | 34 -------------------
 .../realtek/rtlwifi/btcoexist/halbtcoutsrc.h  |  6 ----
 2 files changed, 40 deletions(-)

diff --git a/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtcoutsrc.c b/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtcoutsrc.c
index 74c4504065c0..478cca33e5e3 100644
--- a/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtcoutsrc.c
+++ b/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtcoutsrc.c
@@ -1782,22 +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_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))
@@ -1806,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) {
diff --git a/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtcoutsrc.h b/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtcoutsrc.h
index 5d146fcb7852..d8d88a989806 100644
--- a/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtcoutsrc.h
+++ b/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtcoutsrc.h
@@ -766,12 +766,6 @@ void exhalbtc_bt_info_notify(struct btc_coexist *btcoexist, u8 *tmp_buf,
 void exhalbtc_halt_notify(struct btc_coexist *btcoexist);
 void exhalbtc_pnp_notify(struct btc_coexist *btcoexist, u8 pnp_state);
 void exhalbtc_periodical(struct btc_coexist *btcoexist);
-void exhalbtc_dbg_control(struct btc_coexist *btcoexist, u8 code, u8 len,
-			  u8 *data);
-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);
-- 
2.47.0

Re: [PATCH 1/2] rtlwifi: Remove unused functions

[Kalle Valo]

linux@treblig.org writes:

> From: "Dr. David Alan Gilbert" <linux@treblig.org>
>
> exhalbtc_rf_status_notify(), exhalbtc_coex_dm_switch() and
> exhalbtc_antenna_detection() are unused since they were added in 2017's
> commit 7937f02d1953 ("rtlwifi: btcoex: hook external functions for newer
> chips")
>
> Remove them.
>
> This leaves ex_btc8723b1ant_coex_dm_reset() unused.
>
> Remove it.
>
> Signed-off-by: Dr. David Alan Gilbert <linux@treblig.org>

'wifi:' missing.

-- 
https://patchwork.kernel.org/project/linux-wireless/list/

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

Re: [PATCH 2/2] rtlwifi: Remove more unused functions

[Kalle Valo]

linux@treblig.org writes:

> From: "Dr. David Alan Gilbert" <linux@treblig.org>
>
> 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 aa45a673b291 ("rtlwifi: btcoexist: Add new mini driver")
>
> Remove them.
>
> Signed-off-by: Dr. David Alan Gilbert <linux@treblig.org>

'wifi:' missing. Also in both patches the subject could be more unique.

-- 
https://patchwork.kernel.org/project/linux-wireless/list/

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

Re: [PATCH 2/2] rtlwifi: Remove more unused functions

[Dr. David Alan Gilbert]

* Kalle Valo (kvalo@kernel.org) wrote:
> linux@treblig.org writes:
> 
> > From: "Dr. David Alan Gilbert" <linux@treblig.org>
> >
> > 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 aa45a673b291 ("rtlwifi: btcoexist: Add new mini driver")
> >
> > Remove them.
> >
> > Signed-off-by: Dr. David Alan Gilbert <linux@treblig.org>
> 
> 'wifi:' missing.

Oops, can add that.

> Also in both patches the subject could be more unique.

Do you have suggestions? I don't know the code to give good titles.
They're both 'btcoexist'; I could merge them into one

wifi: wtlwifi: Remove btcoexist deadcode

Dave

> 
> -- 
> https://patchwork.kernel.org/project/linux-wireless/list/
> 
> https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches
-- 
 -----Open up your eyes, open up your mind, open up your code -------   
/ Dr. David Alan Gilbert    |       Running GNU/Linux       | Happy  \ 
\        dave @ treblig.org |                               | In Hex /
 \ _________________________|_____ http://www.treblig.org   |_______/

Re: [PATCH 2/2] rtlwifi: Remove more unused functions

[Kalle Valo]

"Dr. David Alan Gilbert" <linux@treblig.org> writes:

> * Kalle Valo (kvalo@kernel.org) wrote:
>> linux@treblig.org writes:
>> 
>> > From: "Dr. David Alan Gilbert" <linux@treblig.org>
>> >
>> > 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 aa45a673b291 ("rtlwifi: btcoexist: Add new mini driver")
>> >
>> > Remove them.
>> >
>> > Signed-off-by: Dr. David Alan Gilbert <linux@treblig.org>
>> 
>> 'wifi:' missing.
>
> Oops, can add that.
>
>> Also in both patches the subject could be more unique.
>
> Do you have suggestions? I don't know the code to give good titles.
> They're both 'btcoexist'; I could merge them into one
>
> wifi: wtlwifi: Remove btcoexist deadcode

No good suggestions really. Usually I add what I'm removing to the
subject but as this patch is removing several functions the subject
would be too long. Maybe something like 'wifi: rtlwifi: remove several
unused exhalbtc_*() functions?' just to throw out some ideas, I'm sure
you can come with better ones.

-- 
https://patchwork.kernel.org/project/linux-wireless/list/

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

Re: [PATCH 2/2] rtlwifi: Remove more unused functions

[Dr. David Alan Gilbert]

* Kalle Valo (kvalo@kernel.org) wrote:
> "Dr. David Alan Gilbert" <linux@treblig.org> writes:
> 
> > * Kalle Valo (kvalo@kernel.org) wrote:
> >> linux@treblig.org writes:
> >> 
> >> > From: "Dr. David Alan Gilbert" <linux@treblig.org>
> >> >
> >> > 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 aa45a673b291 ("rtlwifi: btcoexist: Add new mini driver")
> >> >
> >> > Remove them.
> >> >
> >> > Signed-off-by: Dr. David Alan Gilbert <linux@treblig.org>
> >> 
> >> 'wifi:' missing.
> >
> > Oops, can add that.
> >
> >> Also in both patches the subject could be more unique.
> >
> > Do you have suggestions? I don't know the code to give good titles.
> > They're both 'btcoexist'; I could merge them into one
> >
> > wifi: wtlwifi: Remove btcoexist deadcode
> 
> No good suggestions really. Usually I add what I'm removing to the
> subject but as this patch is removing several functions the subject
> would be too long. Maybe something like 'wifi: rtlwifi: remove several
> unused exhalbtc_*() functions?' just to throw out some ideas, I'm sure
> you can come with better ones.

OK, I've just merged the two together, and sent it out as a single patch

[PATCH v2] wifi: rtlwifi: Remove some exhalbtc deadcod
message-id: 20241104144331.29262-1-linux@treblig.org

Dave

> 
> -- 
> https://patchwork.kernel.org/project/linux-wireless/list/
> 
> https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches
> 
-- 
 -----Open up your eyes, open up your mind, open up your code -------   
/ Dr. David Alan Gilbert    |       Running GNU/Linux       | Happy  \ 
\        dave @ treblig.org |                               | In Hex /
 \ _________________________|_____ http://www.treblig.org   |_______/