2020-08-29 00:57:41

by Larry Finger

Subject: [PATCH v3 00/15 rtlwifi: Change RT_TRACE into rtl_dbg for all drivers

This submission consists of the two patches that failed in the v2 case.

Larry Finger (2):
rtlwifi: rtl8821ae: Rename RT_TRACE to rtl_dbg
rtlwifi: Remove temporary definition of RT_TRACE

drivers/net/wireless/realtek/rtlwifi/debug.h | 17 +-
.../wireless/realtek/rtlwifi/rtl8821ae/dm.c | 821 +++++++++---------
.../wireless/realtek/rtlwifi/rtl8821ae/fw.c | 134 +--
.../wireless/realtek/rtlwifi/rtl8821ae/hw.c | 456 +++++-----
.../wireless/realtek/rtlwifi/rtl8821ae/led.c | 32 +-
.../wireless/realtek/rtlwifi/rtl8821ae/phy.c | 527 +++++------
.../wireless/realtek/rtlwifi/rtl8821ae/rf.c | 6 +-
.../wireless/realtek/rtlwifi/rtl8821ae/trx.c | 59 +-
8 files changed, 1023 insertions(+), 1029 deletions(-)

--
2.28.0

2020-08-29 00:59:56

by Larry Finger

Subject: [PATCH v3 15/15] rtlwifi: Remove temporary definition of RT_TRACE

A definition of this macro was kept until all drivers had been converted.
It can now be deleted.

This change also renames _rtl_dbg_trace() to _rtl_dbg_out().

Signed-off-by: Larry Finger <[email protected]>
---
v2 - rtl_dbg is used rather than RTL_DEBUG
v3 - the problems with the original submission are fixed.
---
drivers/net/wireless/realtek/rtlwifi/debug.h | 17 +++--------------
1 file changed, 3 insertions(+), 14 deletions(-)

diff --git a/drivers/net/wireless/realtek/rtlwifi/debug.h b/drivers/net/wireless/realtek/rtlwifi/debug.h
index dbfb4d67ca31..6028f1ffa5da 100644
--- a/drivers/net/wireless/realtek/rtlwifi/debug.h
+++ b/drivers/net/wireless/realtek/rtlwifi/debug.h
@@ -149,8 +149,8 @@ enum dbgp_flag_e {
struct rtl_priv;

__printf(4, 5)
-void _rtl_dbg_trace(struct rtl_priv *rtlpriv, u64 comp, int level,
- const char *fmt, ...);
+void _rtl_dbg_out(struct rtl_priv *rtlpriv, u64 comp, int level,
+ const char *fmt, ...);

__printf(4, 5)
void _rtl_dbg_print(struct rtl_priv *rtlpriv, u64 comp, int level,
@@ -161,11 +161,7 @@ void _rtl_dbg_print_data(struct rtl_priv *rtlpriv, u64 comp, int level,
const void *hexdata, int hexdatalen);

#define rtl_dbg(rtlpriv, comp, level, fmt, ...) \
- _rtl_dbg_trace(rtlpriv, comp, level, \
- fmt, ##__VA_ARGS__)
-
-#define RT_TRACE(rtlpriv, comp, level, fmt, ...) \
- _rtl_dbg_trace(rtlpriv, comp, level, \
+ _rtl_dbg_out(rtlpriv, comp, level, \
fmt, ##__VA_ARGS__)

#define RTPRINT(rtlpriv, dbgtype, dbgflag, fmt, ...) \
@@ -187,13 +183,6 @@ static inline void rtl_dbg(struct rtl_priv *rtlpriv,
{
}

-__printf(4, 5)
-static inline void RT_TRACE(struct rtl_priv *rtlpriv,
- u64 comp, int level,
- const char *fmt, ...)
-{
-}
-
__printf(4, 5)
static inline void RTPRINT(struct rtl_priv *rtlpriv,
int dbgtype, int dbgflag,
--
2.28.0