mei: use unified format for printing mei message header

Introduce MEI_HDR_FMT and MEI_HDR_PRM macros.

Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

5 files changed, 16 insertions, 15 deletions

diff --git a/drivers/misc/mei/amthif.c b/drivers/misc/mei/amthif.c
index 8a9313a1ee7b..77acd2349b1b 100644
--- a/drivers/misc/mei/amthif.c
+++ b/drivers/misc/mei/amthif.c
@@ -457,8 +457,7 @@ int mei_amthif_irq_write_complete(struct mei_device *dev, s32 *slots,
                 return 0;
         }
 
-        dev_dbg(&dev->pdev->dev, "msg: len = %d complete = %d\n",
-                        mei_hdr->length, mei_hdr->msg_complete);
+        dev_dbg(&dev->pdev->dev, MEI_HDR_FMT,  MEI_HDR_PRM(mei_hdr));
 
         *slots -=  msg_slots;
         if (mei_write_message(dev, mei_hdr,
diff --git a/drivers/misc/mei/interface.c b/drivers/misc/mei/interface.c
index 21ccbe6f7162..17d93f71d6bf 100644
--- a/drivers/misc/mei/interface.c
+++ b/drivers/misc/mei/interface.c
@@ -127,9 +127,7 @@ int mei_write_message(struct mei_device *dev, struct mei_msg_hdr *header,
         int i;
         int empty_slots;
 
-        dev_dbg(&dev->pdev->dev,
-                        "mei_write_message header=%08x.\n",
-                        *((u32 *) header));
+        dev_dbg(&dev->pdev->dev, MEI_HDR_FMT, MEI_HDR_PRM(header));
 
         empty_slots = mei_hbuf_empty_slots(dev);
         dev_dbg(&dev->pdev->dev, "empty slots = %hu.\n", empty_slots);
diff --git a/drivers/misc/mei/interrupt.c b/drivers/misc/mei/interrupt.c
index b72fa8196ddb..fe93d1c9c242 100644
--- a/drivers/misc/mei/interrupt.c
+++ b/drivers/misc/mei/interrupt.c
@@ -150,8 +150,8 @@ quit:
         dev_dbg(&dev->pdev->dev, "message read\n");
         if (!buffer) {
                 mei_read_slots(dev, dev->rd_msg_buf, mei_hdr->length);
-                dev_dbg(&dev->pdev->dev, "discarding message, header =%08x.\n",
-                                *(u32 *) dev->rd_msg_buf);
+                dev_dbg(&dev->pdev->dev, "discarding message " MEI_HDR_FMT "\n",
+                                MEI_HDR_PRM(mei_hdr));
         }
 
         return 0;
@@ -742,8 +742,7 @@ static int mei_irq_thread_write_complete(struct mei_device *dev, s32 *slots,
 
         dev_dbg(&dev->pdev->dev, "buf: size = %d idx = %lu\n",
                         cb->request_buffer.size, cb->buf_idx);
-        dev_dbg(&dev->pdev->dev, "msg: len = %d complete = %d\n",
-                        mei_hdr->length, mei_hdr->msg_complete);
+        dev_dbg(&dev->pdev->dev, MEI_HDR_FMT, MEI_HDR_PRM(mei_hdr));
 
         *slots -=  msg_slots;
         if (mei_write_message(dev, mei_hdr,
@@ -790,7 +789,7 @@ static int mei_irq_thread_read_handler(struct mei_cl_cb *cmpl_list,
                 dev_dbg(&dev->pdev->dev, "slots =%08x.\n", *slots);
         }
         mei_hdr = (struct mei_msg_hdr *) &dev->rd_msg_hdr;
-        dev_dbg(&dev->pdev->dev, "mei_hdr->length =%d\n", mei_hdr->length);
+        dev_dbg(&dev->pdev->dev, MEI_HDR_FMT, MEI_HDR_PRM(mei_hdr));
 
         if (mei_hdr->reserved || !dev->rd_msg_hdr) {
                 dev_dbg(&dev->pdev->dev, "corrupted message header.\n");
@@ -835,13 +834,12 @@ static int mei_irq_thread_read_handler(struct mei_cl_cb *cmpl_list,
                    (MEI_FILE_CONNECTED == dev->iamthif_cl.state) &&
                    (dev->iamthif_state == MEI_IAMTHIF_READING)) {
                 dev_dbg(&dev->pdev->dev, "call mei_irq_thread_read_iamthif_message.\n");
-                dev_dbg(&dev->pdev->dev, "mei_hdr->length =%d\n",
-                                mei_hdr->length);
+
+                dev_dbg(&dev->pdev->dev, MEI_HDR_FMT, MEI_HDR_PRM(mei_hdr));
 
                 ret = mei_amthif_irq_read_message(cmpl_list, dev, mei_hdr);
                 if (ret)
                         goto end;
-
         } else {
                 dev_dbg(&dev->pdev->dev, "call mei_irq_thread_read_client_message.\n");
                 ret = mei_irq_thread_read_client_message(cmpl_list,
diff --git a/drivers/misc/mei/main.c b/drivers/misc/mei/main.c
index b281c235d898..7751b58540ac 100644
--- a/drivers/misc/mei/main.c
+++ b/drivers/misc/mei/main.c
@@ -552,8 +552,9 @@ static ssize_t mei_write(struct file *file, const char __user *ubuf,
         mei_hdr.host_addr = cl->host_client_id;
         mei_hdr.me_addr = cl->me_client_id;
         mei_hdr.reserved = 0;
-        dev_dbg(&dev->pdev->dev, "call mei_write_message header=%08x.\n",
-            *((u32 *) &mei_hdr));
+
+        dev_dbg(&dev->pdev->dev, "write " MEI_HDR_FMT "\n",
+                MEI_HDR_PRM(&mei_hdr));
         if (mei_write_message(dev, &mei_hdr, write_cb->request_buffer.data)) {
                 rets = -ENODEV;
                 goto err;
diff --git a/drivers/misc/mei/mei_dev.h b/drivers/misc/mei/mei_dev.h
index 25da04549d04..da0980531c62 100644
--- a/drivers/misc/mei/mei_dev.h
+++ b/drivers/misc/mei/mei_dev.h
@@ -506,4 +506,9 @@ static inline struct mei_msg_hdr *mei_hbm_hdr(u32 *buf, size_t length)
         return hdr;
 }
 
+#define MEI_HDR_FMT "hdr:host=%02d me=%02d len=%d comp=%1d"
+#define MEI_HDR_PRM(hdr)                  \
+        (hdr)->host_addr, (hdr)->me_addr, \
+        (hdr)->length, (hdr)->msg_complete
+
 #endif