diff options
-rw-r--r-- | drivers/misc/mei/hbm.c | 3 | ||||
-rw-r--r-- | drivers/misc/mei/main.c | 10 |
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) | |||
329 | mei_hbm_hdr(mei_hdr, len); | 329 | mei_hbm_hdr(mei_hdr, len); |
330 | mei_hbm_cl_hdr(cl, MEI_FLOW_CONTROL_CMD, dev->wr_msg.data, len); | 330 | mei_hbm_cl_hdr(cl, MEI_FLOW_CONTROL_CMD, dev->wr_msg.data, len); |
331 | 331 | ||
332 | dev_dbg(&dev->pdev->dev, "sending flow control host client = %d, ME client = %d\n", | 332 | cl_dbg(dev, cl, "sending flow control\n"); |
333 | cl->host_client_id, cl->me_client_id); | ||
334 | 333 | ||
335 | return mei_write_message(dev, mei_hdr, dev->wr_msg.data); | 334 | return mei_write_message(dev, mei_hdr, dev->wr_msg.data); |
336 | } | 335 | } |
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) | |||
125 | } | 125 | } |
126 | if (cl->state == MEI_FILE_CONNECTED) { | 126 | if (cl->state == MEI_FILE_CONNECTED) { |
127 | cl->state = MEI_FILE_DISCONNECTING; | 127 | cl->state = MEI_FILE_DISCONNECTING; |
128 | dev_dbg(&dev->pdev->dev, | 128 | cl_dbg(dev, cl, "disconnecting\n"); |
129 | "disconnecting client host client = %d, " | ||
130 | "ME client = %d\n", | ||
131 | cl->host_client_id, | ||
132 | cl->me_client_id); | ||
133 | rets = mei_cl_disconnect(cl); | 129 | rets = mei_cl_disconnect(cl); |
134 | } | 130 | } |
135 | mei_cl_flush_queues(cl); | 131 | mei_cl_flush_queues(cl); |
136 | dev_dbg(&dev->pdev->dev, "remove client host client = %d, ME client = %d\n", | 132 | cl_dbg(dev, cl, "removing\n"); |
137 | cl->host_client_id, | ||
138 | cl->me_client_id); | ||
139 | 133 | ||
140 | mei_cl_unlink(cl); | 134 | mei_cl_unlink(cl); |
141 | 135 | ||