From 1b34696d54385134733879daa36741becf2bea6a Mon Sep 17 00:00:00 2001 From: Jordan Crouse Date: Tue, 15 Oct 2019 09:37:37 -0600 Subject: [PATCH] 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: Jordan Crouse --- drivers/mailbox/msm_qmp.c | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/drivers/mailbox/msm_qmp.c b/drivers/mailbox/msm_qmp.c index b7c08abff129..30252024fd31 100644 --- a/drivers/mailbox/msm_qmp.c +++ b/drivers/mailbox/msm_qmp.c @@ -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__); \ +#define QMP_ERR(ctxt, x, ...) \ +do { \ + printk_ratelimited("%s[%s]: "x, KERN_ERR, __func__, ##__VA_ARGS__); \ + ipc_log_string(ctxt, "%s[%s]: "x, "", __func__, ##__VA_ARGS__); \ } while (0) /**