Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4d3d125d authored by Yue Ma's avatar Yue Ma Committed by Gerrit - the friendly Code Review server
Browse files

cnss2: Consolidate logging message 



Currently the code makes liberal use of macros that print a log
message (with pr_err or pr_debug) and then passes the same string
on to the IPC logging mechanism. The problem is that it doesn't
actually end up being the same string in the binary. Using pr_err
or one of its friends appends the KERN_* code to the front of the
string with the pre-processor and the IPC logger just uses the
passed in string. Every string used by the macros ends up appearing
twice in the binary, once with KERN_* prepended and the other not.

This change fixes this duplication issue by appending KERN_* to the
front of the IPC logger for CNSS2 driver.

Change-Id: I62facd7aaf23bd06fad84d272144f1a50ad539a5
Signed-off-by: default avatarYue Ma <yuem@codeaurora.org>
parent d5546ff2

drivers/net/wireless/cnss2/debug.h

+8 −8
Original line number Diff line number Diff line
@@ -26,23 +26,23 @@ extern void *cnss_ipc_log_context; 
	} while (0)



#define cnss_pr_err(_fmt, ...) do {					\

		pr_err("cnss: " _fmt, ##__VA_ARGS__);			\

		cnss_ipc_log_string("ERR: " _fmt, ##__VA_ARGS__);	\

		printk("%scnss: " _fmt, KERN_ERR, ##__VA_ARGS__);	\

		cnss_ipc_log_string("%scnss: " _fmt, "", ##__VA_ARGS__);\

	} while (0)



#define cnss_pr_warn(_fmt, ...) do {					\

		pr_warn("cnss: " _fmt, ##__VA_ARGS__);			\

		cnss_ipc_log_string("WRN: " _fmt, ##__VA_ARGS__);	\

		printk("%scnss: " _fmt, KERN_WARNING, ##__VA_ARGS__);	\

		cnss_ipc_log_string("%scnss: " _fmt, "", ##__VA_ARGS__);\

	} while (0)



#define cnss_pr_info(_fmt, ...) do {					\

		pr_info("cnss: " _fmt, ##__VA_ARGS__);			\

		cnss_ipc_log_string("INF: " _fmt, ##__VA_ARGS__);	\

		printk("%scnss: " _fmt, KERN_INFO, ##__VA_ARGS__);	\

		cnss_ipc_log_string("%scnss: " _fmt, "", ##__VA_ARGS__);\

	} while (0)



#define cnss_pr_dbg(_fmt, ...) do {					\

		pr_debug("cnss: " _fmt, ##__VA_ARGS__);			\

		cnss_ipc_log_string("DBG: " _fmt, ##__VA_ARGS__);	\

		printk("%scnss: " _fmt, KERN_DEBUG, ##__VA_ARGS__);	\

		cnss_ipc_log_string("%scnss: " _fmt, "", ##__VA_ARGS__);\

	} while (0)



#ifdef CONFIG_CNSS2_DEBUG