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

Commit 996daef5 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "icnss: Consolidate logging message" into msm-next

parents 30e57e48 c568b803

drivers/soc/qcom/icnss.c

+39 −15
Original line number Diff line number Diff line
@@ -84,34 +84,58 @@ module_param(qmi_timeout, ulong, 0600); 
	} while (0)



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

		pr_err(_fmt, ##__VA_ARGS__);				\

		icnss_ipc_log_string("ERR: " pr_fmt(_fmt),		\

	printk("%s" pr_fmt(_fmt), KERN_ERR, ##__VA_ARGS__);		\

	icnss_ipc_log_string("%s" pr_fmt(_fmt), "",			\

			     ##__VA_ARGS__);				\

	} while (0)



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

		pr_warn(_fmt, ##__VA_ARGS__);				\

		icnss_ipc_log_string("WRN: " pr_fmt(_fmt),		\

	printk("%s" pr_fmt(_fmt), KERN_WARNING, ##__VA_ARGS__);		\

	icnss_ipc_log_string("%s" pr_fmt(_fmt), "",			\

			     ##__VA_ARGS__);				\

	} while (0)



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

		pr_info(_fmt, ##__VA_ARGS__);				\

		icnss_ipc_log_string("INF: " pr_fmt(_fmt),		\

	printk("%s" pr_fmt(_fmt), KERN_INFO, ##__VA_ARGS__);		\

	icnss_ipc_log_string("%s" pr_fmt(_fmt), "",			\

			     ##__VA_ARGS__);				\

	} while (0)



#if defined(CONFIG_DYNAMIC_DEBUG)

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

	pr_debug(_fmt, ##__VA_ARGS__);					\

		icnss_ipc_log_string("DBG: " pr_fmt(_fmt),		\

				     ##__VA_ARGS__);			\

	icnss_ipc_log_string(pr_fmt(_fmt), ##__VA_ARGS__);		\

	} while (0)



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

	pr_debug(_fmt, ##__VA_ARGS__);					\

		icnss_ipc_log_long_string("DBG: " pr_fmt(_fmt),		\

	icnss_ipc_log_long_string(pr_fmt(_fmt), ##__VA_ARGS__);		\

	} while (0)

#elif defined(DEBUG)

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

	printk("%s" pr_fmt(_fmt), KERN_DEBUG, ##__VA_ARGS__);		\

	icnss_ipc_log_string("%s" pr_fmt(_fmt), "",			\

			     ##__VA_ARGS__);				\

	} while (0)



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

	printk("%s" pr_fmt(_fmt), KERN_DEBUG, ##__VA_ARGS__);		\

	icnss_ipc_log_long_string("%s" pr_fmt(_fmt), "",		\

				  ##__VA_ARGS__);			\

	} while (0)

#else

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

	no_printk("%s" pr_fmt(_fmt), KERN_DEBUG, ##__VA_ARGS__);	\

	icnss_ipc_log_string("%s" pr_fmt(_fmt), "",			\

		     ##__VA_ARGS__);					\

	} while (0)



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

	no_printk("%s" pr_fmt(_fmt), KERN_DEBUG, ##__VA_ARGS__);	\

	icnss_ipc_log_long_string("%s" pr_fmt(_fmt), "",		\

				  ##__VA_ARGS__);			\

	} while (0)

#endif



#ifdef CONFIG_ICNSS_DEBUG

#define ICNSS_ASSERT(_condition) do {					\