2020-08-31 22:38:29

by Larry Finger

Subject: [PATCH v4 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.
v4 - Change to debug.c was missed.
---

drivers/net/wireless/realtek/rtlwifi/debug.c | 6 +++---
drivers/net/wireless/realtek/rtlwifi/debug.h | 17 +++--------------
2 files changed, 6 insertions(+), 17 deletions(-)

diff --git a/drivers/net/wireless/realtek/rtlwifi/debug.c b/drivers/net/wireless/realtek/rtlwifi/debug.c
index de15d42c7b3c..455b87e7548b 100644
--- a/drivers/net/wireless/realtek/rtlwifi/debug.c
+++ b/drivers/net/wireless/realtek/rtlwifi/debug.c
@@ -8,8 +8,8 @@
#include <linux/vmalloc.h>

#ifdef CONFIG_RTLWIFI_DEBUG
-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, ...)
{
if (unlikely((comp & rtlpriv->cfg->mod_params->debug_mask) &&
level <= rtlpriv->cfg->mod_params->debug_level)) {
@@ -26,7 +26,7 @@ void _rtl_dbg_trace(struct rtl_priv *rtlpriv, u64 comp, int level,
va_end(args);
}
}
-EXPORT_SYMBOL_GPL(_rtl_dbg_trace);
+EXPORT_SYMBOL_GPL(_rtl_dbg_out);

void _rtl_dbg_print(struct rtl_priv *rtlpriv, u64 comp, int level,
const char *fmt, ...)
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

2020-09-02 09:05:15

by Kalle Valo

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

Larry Finger <[email protected]> wrote:

> 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]>

Patch applied to wireless-drivers-next.git, thanks.

4d342964f31e rtlwifi: Remove temporary definition of RT_TRACE

--
https://patchwork.kernel.org/patch/11746899/

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