rtlwifi: Rework RT_PRINT_DATA macro

The macro definition has been replaced by the equivalent compiled routine. This change saves roughly 15,000 bytes. Signed-off-by: Larry Finger <[email protected]>
w179962443 · Dec 9, 2016 · 2c28e57 · 2c28e57
1 parent d6b3e26
commit 2c28e57
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 11 deletions.
diff --git a/debug.c b/debug.c
@@ -75,6 +75,22 @@ void _rtl_dbg_trace_string(struct rtl_priv *rtlpriv, u64 comp, int level,
 	}
 }
 EXPORT_SYMBOL_GPL(_rtl_dbg_trace_string);
+
+void _rtl_dbg_print_data(struct rtl_priv *rtlpriv, u64 comp, int level,
+			 const char *modname, const char *titlestring,
+			 const void *hexdata, int hexdatalen)
+{
+	if (unlikely(((comp) & rtlpriv->dbg.global_debug_mask) ||
+		     ((level) <= rtlpriv->dbg.global_debuglevel))) {
+		printk(KERN_DEBUG "%s: In process \"%s\" (pid %i): %s\n",
+		       KBUILD_MODNAME, current->comm, current->pid,
+		       titlestring);
+		print_hex_dump_bytes("", DUMP_PREFIX_NONE,
+				     hexdata, hexdatalen);
+	}
+}
+EXPORT_SYMBOL_GPL(_rtl_dbg_print_data);
+
 #endif
 
 static struct dentry *debugfs_topdir;

diff --git a/debug.h b/debug.h
@@ -176,6 +176,10 @@ void _rtl_dbg_trace(struct rtl_priv *rtlpriv, u64 comp, int level,
 void _rtl_dbg_trace_string(struct rtl_priv *rtlpriv, u64 comp, int level,
 			   const char *modname, const char *string);
 
+void _rtl_dbg_print_data(struct rtl_priv *rtlpriv, u64 comp, int level,
+			 const char *modname, const char *titlestring,
+			 const void *hexdata, int hexdatalen);
+
 #define RT_TRACE(rtlpriv, comp, level, fmt, ...)			\
 	_rtl_dbg_trace(rtlpriv, comp, level,				\
 		       KBUILD_MODNAME, fmt, ##__VA_ARGS__)
@@ -194,17 +198,8 @@ do {									\
 
 #define RT_PRINT_DATA(rtlpriv, _comp, _level, _titlestring, _hexdata,	\
 		      _hexdatalen)					\
-do {									\
-	if (unlikely(((_comp) & rtlpriv->dbg.global_debug_mask) ||	\
-		     (_level <= rtlpriv->dbg.global_debuglevel))) {	\
-		printk(KERN_DEBUG "%s: In process \"%s\" (pid %i): %s\n", \
-		       KBUILD_MODNAME, current->comm, current->pid,	\
-		       _titlestring);					\
-		print_hex_dump_bytes("", DUMP_PREFIX_NONE,		\
-				     _hexdata, _hexdatalen);		\
-	}								\
-} while (0)
-
+	_rtl_dbg_print_data(rtlpriv, _comp, _level, KBUILD_MODNAME,	\
+			    _titlestring, _hexdata, _hexdatalen)
 #else
 
 struct rtl_priv;