This patchset removes all DBG_871X usages and definitions.
The whole private tracing system is not tied to a configuration
symbol and the default behaviour is _trace nothing_.
DBG_871X macros require the code to be modified by
hand in order to be turned on. This obviously has not happened
since the code was merged, so just remove them as they are unused.
First patch fix a DBG_871X call. It has three args over only two
placeholders in the first format string argument.
If I would not make this fix, the semantic patch
used to bulk remove all macro occurences would ignore the abnormal
macro (the one with three args) and all subsequent occurrences in
the same file (core/rtw_recv.c).
The second patch applies the cocci script.
This is the semantic patch:
@@
expression a, b, c, d, e, f, g, h, i, j, k;
constant B, C, D, E;
@@
(
- DBG_871X(a);
|
- DBG_871X(a, b);
|
- DBG_871X(a, B);
|
- DBG_871X(a, b, c);
|
- DBG_871X(a, B, c);
|
- DBG_871X(a, b, C);
|
- DBG_871X(a, B, C);
|
- DBG_871X(a, b, c, d);
|
- DBG_871X(a, B, c, d);
|
- DBG_871X(a, b, C, d);
|
- DBG_871X(a, b, c, D);
|
- DBG_871X(a, B, C, d);
|
- DBG_871X(a, B, c, D);
|
- DBG_871X(a, b, C, D);
|
- DBG_871X(a, B, C, D);
|
- DBG_871X(a, b, c, d, e);
|
- DBG_871X(a, B, c, d, e);
|
- DBG_871X(a, b, C, d, e);
|
- DBG_871X(a, b, c, D, e);
|
- DBG_871X(a, b, c, d, E);
|
- DBG_871X(a, B, C, d, e);
|
- DBG_871X(a, B, c, D, e);
|
- DBG_871X(a, B, c, d, E);
|
- DBG_871X(a, b, C, D, e);
|
- DBG_871X(a, b, C, d, E);
|
- DBG_871X(a, b, c, D, E);
|
- DBG_871X(a, B, C, D, e);
|
- DBG_871X(a, B, C, d, E);
|
- DBG_871X(a, B, c, D, E);
|
- DBG_871X(a, b, C, D, E);
|
- DBG_871X(a, B, C, D, E);
|
- DBG_871X(a, b, c, d, e, f);
|
- DBG_871X(a, b, c, d, e, f, g);
|
- DBG_871X(a, b, c, d, e, f, g, h);
|
- DBG_871X(a, b, c, d, e, f, g, h, i);
|
- DBG_871X(a, b, c, d, e, f, g, h, i, j);
|
- DBG_871X(a, b, c, d, e, f, g, h, i, j, k);
)
The third one removes an unmatched macro call,
maybe due to the trailing \, because the occurrence is
inside a macro expansion.
The fourth one deletes all commented out call spread all over
the rtl8723bs code.
Fifth one removes definitions.
All remaining patches do some code cleaning on all
places where DBG_871X has been removed.
Fabio Aiuto (19):
staging: rtl8723bs: remove DBG_871X log argument
staging: rtl8723bs: remove all DBG_871X logs
staging: rtl8723bs: remove DBG_871CX log unmatched by cocci
staging: rtl8723bs: remove commented out DBG_871X logs
staging: rtl8723bs: remove DBG_871X macro definitions
staging: rtl8723bs: remove all if-else empty blocks left by DBG_871X
removal
drivers: rtl8723bs: rewrite comparison to null
staging: rtl8723bs: put constant on the right side in if condition
staging: rtl8723bs: remove empty for cycles left by DBG_871X removal
staging: rtl8723bs: remove empty tracing function dump_rx_packet
staging: rtl8723bs: remove empty #ifdef blocks after DBG_871X removal
staging: rtl8723bs: remove unnecessary bracks on DBG_871X removal
sites
staging: rtl8723bs: remove unnecessary parentheses in if condition
staging: rtl8723bs: add spaces around operators
staging: rtl8723bs: rewrite comparison to null
staging: rtl8723bs: remove unnecessary parentheses
staging: rtl8723bs: fix comparison in if condition
staging: rtl8723bs: split long lines
staging: rtl8723bs: remove unnecessary parentheses
drivers/staging/rtl8723bs/core/rtw_ap.c | 158 +------
drivers/staging/rtl8723bs/core/rtw_btcoex.c | 12 +-
drivers/staging/rtl8723bs/core/rtw_cmd.c | 51 +--
drivers/staging/rtl8723bs/core/rtw_efuse.c | 11 -
.../staging/rtl8723bs/core/rtw_ieee80211.c | 48 +-
drivers/staging/rtl8723bs/core/rtw_io.c | 7 +-
.../staging/rtl8723bs/core/rtw_ioctl_set.c | 11 +-
drivers/staging/rtl8723bs/core/rtw_mlme.c | 170 +------
drivers/staging/rtl8723bs/core/rtw_mlme_ext.c | 366 ++-------------
drivers/staging/rtl8723bs/core/rtw_pwrctrl.c | 144 +-----
drivers/staging/rtl8723bs/core/rtw_recv.c | 251 +----------
drivers/staging/rtl8723bs/core/rtw_security.c | 26 +-
drivers/staging/rtl8723bs/core/rtw_sta_mgt.c | 10 -
.../staging/rtl8723bs/core/rtw_wlan_util.c | 154 ++-----
drivers/staging/rtl8723bs/core/rtw_xmit.c | 141 +-----
.../staging/rtl8723bs/hal/HalPhyRf_8723B.c | 11 -
drivers/staging/rtl8723bs/hal/HalPwrSeqCmd.c | 9 +-
drivers/staging/rtl8723bs/hal/hal_btcoex.c | 2 -
drivers/staging/rtl8723bs/hal/hal_com.c | 49 +-
.../staging/rtl8723bs/hal/hal_com_phycfg.c | 208 ++-------
drivers/staging/rtl8723bs/hal/hal_intf.c | 12 +-
drivers/staging/rtl8723bs/hal/odm.c | 3 -
drivers/staging/rtl8723bs/hal/rtl8723b_cmd.c | 92 +---
drivers/staging/rtl8723bs/hal/rtl8723b_dm.c | 5 -
.../staging/rtl8723bs/hal/rtl8723b_hal_init.c | 90 +---
.../staging/rtl8723bs/hal/rtl8723b_phycfg.c | 15 +-
.../staging/rtl8723bs/hal/rtl8723bs_recv.c | 9 -
.../staging/rtl8723bs/hal/rtl8723bs_xmit.c | 37 +-
drivers/staging/rtl8723bs/hal/sdio_halinit.c | 31 +-
drivers/staging/rtl8723bs/hal/sdio_ops.c | 23 +-
drivers/staging/rtl8723bs/include/rtw_debug.h | 6 -
.../staging/rtl8723bs/include/rtw_mlme_ext.h | 3 -
.../staging/rtl8723bs/include/rtw_pwrctrl.h | 1 -
.../staging/rtl8723bs/os_dep/ioctl_cfg80211.c | 208 +--------
.../staging/rtl8723bs/os_dep/ioctl_linux.c | 421 +-----------------
drivers/staging/rtl8723bs/os_dep/mlme_linux.c | 6 +-
drivers/staging/rtl8723bs/os_dep/os_intfs.c | 90 +---
.../staging/rtl8723bs/os_dep/osdep_service.c | 2 -
drivers/staging/rtl8723bs/os_dep/recv_linux.c | 5 +-
drivers/staging/rtl8723bs/os_dep/sdio_intf.c | 27 +-
.../staging/rtl8723bs/os_dep/sdio_ops_linux.c | 97 +---
drivers/staging/rtl8723bs/os_dep/xmit_linux.c | 21 +-
42 files changed, 299 insertions(+), 2744 deletions(-)
--
2.20.1
