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

Commit 1b34696d authored by Jordan Crouse's avatar Jordan Crouse
Browse files

mailbox: Don't check for NULL before ipc_log_string() 



The ipc_log_string() function quietly checks for a NULL context so an
explicit check is not needed.

Also fix the string format for QMP_ERROR so that the same string is
generated for both logging methods.

Change-Id: Ic0dedbad69759a9025b41584d13ed6ca982d2015
Signed-off-by: default avatarJordan Crouse <jcrouse@codeaurora.org>
parent 57a1b902

drivers/mailbox/msm_qmp.c

+5 −9
Original line number Diff line number Diff line
@@ -34,16 +34,12 @@ 


#define QMP_IPC_LOG_PAGE_CNT 2

#define QMP_INFO(ctxt, x, ...)						  \

do {									  \

	if (ctxt)							  \

		ipc_log_string(ctxt, "[%s]: "x, __func__, ##__VA_ARGS__); \

} while (0)

	ipc_log_string(ctxt, "[%s]: "x, __func__, ##__VA_ARGS__)



#define QMP_ERR(ctxt, x, ...)						    \

do {									    \

	pr_err_ratelimited("[%s]: "x, __func__, ##__VA_ARGS__);		  \

	if (ctxt)							  \

		ipc_log_string(ctxt, "[%s]: "x, __func__, ##__VA_ARGS__); \

	printk_ratelimited("%s[%s]: "x, KERN_ERR, __func__, ##__VA_ARGS__); \

	ipc_log_string(ctxt, "%s[%s]: "x, "", __func__, ##__VA_ARGS__);	    \

} while (0)



/**