2 files changed, 3 insertions, 10 deletions

diff --git a/drivers/misc/mei/hbm.c b/drivers/misc/mei/hbm.c
index 5fa5ff95ee39..4960288e543a 100644
--- a/drivers/misc/mei/hbm.c
+++ b/drivers/misc/mei/hbm.c
@@ -329,8 +329,7 @@ int mei_hbm_cl_flow_control_req(struct mei_device *dev, struct mei_cl *cl)
         mei_hbm_hdr(mei_hdr, len);
         mei_hbm_cl_hdr(cl, MEI_FLOW_CONTROL_CMD, dev->wr_msg.data, len);
 
-        dev_dbg(&dev->pdev->dev, "sending flow control host client = %d, ME client = %d\n",
-                cl->host_client_id, cl->me_client_id);
+        cl_dbg(dev, cl, "sending flow control\n");
 
         return mei_write_message(dev, mei_hdr, dev->wr_msg.data);
 }
diff --git a/drivers/misc/mei/main.c b/drivers/misc/mei/main.c
index bc1c39e72648..b35594dbf52f 100644
--- a/drivers/misc/mei/main.c
+++ b/drivers/misc/mei/main.c
@@ -125,17 +125,11 @@ static int mei_release(struct inode *inode, struct file *file)
         }
         if (cl->state == MEI_FILE_CONNECTED) {
                 cl->state = MEI_FILE_DISCONNECTING;
-                dev_dbg(&dev->pdev->dev,
-                        "disconnecting client host client = %d, "
-                    "ME client = %d\n",
-                    cl->host_client_id,
-                    cl->me_client_id);
+                cl_dbg(dev, cl, "disconnecting\n");
                 rets = mei_cl_disconnect(cl);
         }
         mei_cl_flush_queues(cl);
-        dev_dbg(&dev->pdev->dev, "remove client host client = %d, ME client = %d\n",
-            cl->host_client_id,
-            cl->me_client_id);
+        cl_dbg(dev, cl, "removing\n");
 
         mei_cl_unlink(cl);