[Openipmi-developer] [PATCH] ipmi: Convert ipmi_debug_msg to pr_debug and use %*ph

[Joe Perches]

Using %*ph format to print small buffers as hex string reduces
overall object size and allows the removal of the two variants
of ipmi_debug_msg.

This also removes unnecessary duplicate colons from output when
enabled by #DEBUG or newly possible CONFIG_DYNAMIC_DEBUG.

Suggested-by: Andy Shevchenko <andriy.shevche...@linux.intel.com>
Signed-off-by: Joe Perches <j...@perches.com>
---
 drivers/char/ipmi/ipmi_msghandler.c | 29 ++++++-----------------------
 1 file changed, 6 insertions(+), 23 deletions(-)

diff --git a/drivers/char/ipmi/ipmi_msghandler.c 
b/drivers/char/ipmi/ipmi_msghandler.c
index 2aab80e19ae0..1b1f6a7dc17d 100644
--- a/drivers/char/ipmi/ipmi_msghandler.c
+++ b/drivers/char/ipmi/ipmi_msghandler.c
@@ -44,25 +44,6 @@ static void need_waiter(struct ipmi_smi *intf);
 static int handle_one_recv_msg(struct ipmi_smi *intf,
                               struct ipmi_smi_msg *msg);
 
-#ifdef DEBUG
-static void ipmi_debug_msg(const char *title, unsigned char *data,
-                          unsigned int len)
-{
-       int i, pos;
-       char buf[100];
-
-       pos = snprintf(buf, sizeof(buf), "%s: ", title);
-       for (i = 0; i < len; i++)
-               pos += snprintf(buf + pos, sizeof(buf) - pos,
-                               " %2.2x", data[i]);
-       pr_debug("%s\n", buf);
-}
-#else
-static void ipmi_debug_msg(const char *title, unsigned char *data,
-                          unsigned int len)
-{ }
-#endif
-
 static bool initialized;
 static bool drvregistered;
 
@@ -2267,7 +2248,8 @@ static int i_ipmi_request(struct ipmi_user     *user,
                ipmi_free_smi_msg(smi_msg);
                ipmi_free_recv_msg(recv_msg);
        } else {
-               ipmi_debug_msg("Send", smi_msg->data, smi_msg->data_size);
+               pr_debug("%s: %*ph\n",
+                        "Send", smi_msg->data, smi_msg->data_size);
 
                smi_send(intf, intf->handlers, smi_msg, priority);
        }
@@ -3730,7 +3712,8 @@ static int handle_ipmb_get_msg_cmd(struct ipmi_smi *intf,
                msg->data[10] = ipmb_checksum(&msg->data[6], 4);
                msg->data_size = 11;
 
-               ipmi_debug_msg("Invalid command:", msg->data, msg->data_size);
+               pr_debug("%s: %*ph\n",
+                        "Invalid command", msg->data, msg->data_size);
 
                rcu_read_lock();
                if (!intf->in_shutdown) {
@@ -4217,7 +4200,7 @@ static int handle_one_recv_msg(struct ipmi_smi *intf,
        int requeue;
        int chan;
 
-       ipmi_debug_msg("Recv:", msg->rsp, msg->rsp_size);
+       pr_debug("%s: %*ph\n", "Recv", msg->rsp, msg->rsp_size);
 
        if ((msg->data_size >= 2)
            && (msg->data[0] == (IPMI_NETFN_APP_REQUEST << 2))
@@ -4576,7 +4559,7 @@ smi_from_recv_msg(struct ipmi_smi *intf, struct 
ipmi_recv_msg *recv_msg,
        smi_msg->data_size = recv_msg->msg.data_len;
        smi_msg->msgid = STORE_SEQ_IN_MSGID(seq, seqid);
 
-       ipmi_debug_msg("Resend: ", smi_msg->data, smi_msg->data_size);
+       pr_debug("%s: %*ph\n", "Resend", smi_msg->data, smi_msg->data_size);
 
        return smi_msg;
 }




_______________________________________________
Openipmi-developer mailing list
Openipmi-developer@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/openipmi-developer