[PATCH] staging: r8188eu: Remove dead code

[PATCH] staging: r8188eu: Remove dead code

[Paul Bolle]

There are a few lines in this driver that depend on a macro
CONFIG_BT_COEXIST. But there's no Kconfig symbol of that name nor is
there a preprocessor define for that string. So remove these lines.

Signed-off-by: Paul Bolle <pebolle@tiscali.nl>
---
Entirely untested.

Fun fact: two years ago, code depending on the same undefined macro was
removed from rtl8192cu, see commit 9ef11f7b34c0 ("rtl8192cu: Remove dead
code never selected"). I wonder where this macro originated.

 drivers/staging/rtl8188eu/include/rtw_debug.h   | 10 ----------
 drivers/staging/rtl8188eu/include/rtw_pwrctrl.h |  4 ----
 2 files changed, 14 deletions(-)

diff --git a/drivers/staging/rtl8188eu/include/rtw_debug.h b/drivers/staging/rtl8188eu/include/rtw_debug.h
index c6b193a..7cd61b2 100644
--- a/drivers/staging/rtl8188eu/include/rtw_debug.h
+++ b/drivers/staging/rtl8188eu/include/rtw_debug.h
@@ -277,14 +277,4 @@ int proc_get_rssi_disp(char *page, char **start,
 int proc_set_rssi_disp(struct file *file, const char __user *buffer,
 		       unsigned long count, void *data);
 
-#ifdef CONFIG_BT_COEXIST
-int proc_get_btcoex_dbg(char *page, char **start,
-			off_t offset, int count,
-			int *eof, void *data);
-
-int proc_set_btcoex_dbg(struct file *file, const char *buffer,
-			signed long count, void *data);
-
-#endif /* CONFIG_BT_COEXIST */
-
 #endif	/* __RTW_DEBUG_H__ */
diff --git a/drivers/staging/rtl8188eu/include/rtw_pwrctrl.h b/drivers/staging/rtl8188eu/include/rtw_pwrctrl.h
index 4a0e9ff..9a42859 100644
--- a/drivers/staging/rtl8188eu/include/rtw_pwrctrl.h
+++ b/drivers/staging/rtl8188eu/include/rtw_pwrctrl.h
@@ -206,10 +206,6 @@ struct pwrctrl_priv {
 
 	u8		bInternalAutoSuspend;
 	u8		bInSuspend;
-#ifdef	CONFIG_BT_COEXIST
-	u8		bAutoResume;
-	u8		autopm_cnt;
-#endif
 	u8		bSupportRemoteWakeup;
 	struct timer_list pwr_state_check_timer;
 	int		pwr_state_check_interval;
-- 
1.8.5.3

Re: [PATCH] staging: r8188eu: Remove dead code

[Greg Kroah-Hartman]

On Thu, Feb 13, 2014 at 01:00:18PM +0100, Paul Bolle wrote:
> There are a few lines in this driver that depend on a macro
> CONFIG_BT_COEXIST. But there's no Kconfig symbol of that name nor is
> there a preprocessor define for that string. So remove these lines.
> 
> Signed-off-by: Paul Bolle <pebolle@tiscali.nl>
> ---
> Entirely untested.
> 
> Fun fact: two years ago, code depending on the same undefined macro was
> removed from rtl8192cu, see commit 9ef11f7b34c0 ("rtl8192cu: Remove dead
> code never selected"). I wonder where this macro originated.

It comes from the stand-alone version of this driver, and the config
options that it "provides" when building.  So expect it to constantly
show up until this company stops relying on their internal tree...

thanks,

greg k-h