aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/misc/mei/amthif.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/misc/mei/amthif.c')
-rw-r--r--drivers/misc/mei/amthif.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/misc/mei/amthif.c b/drivers/misc/mei/amthif.c
index add4254eb850..cbc9c4e4e321 100644
--- a/drivers/misc/mei/amthif.c
+++ b/drivers/misc/mei/amthif.c
@@ -36,6 +36,7 @@
36#include "mei_dev.h" 36#include "mei_dev.h"
37#include "hbm.h" 37#include "hbm.h"
38#include "interface.h" 38#include "interface.h"
39#include "client.h"
39 40
40const uuid_le mei_amthi_guid = UUID_LE(0x12f80028, 0xb4b7, 0x4b2d, 0xac, 41const uuid_le mei_amthi_guid = UUID_LE(0x12f80028, 0xb4b7, 0x4b2d, 0xac,
41 0xa8, 0x46, 0xe0, 0xff, 0x65, 42 0xa8, 0x46, 0xe0, 0xff, 0x65,
@@ -73,7 +74,7 @@ void mei_amthif_host_init(struct mei_device *dev)
73 dev->iamthif_cl.state = MEI_FILE_DISCONNECTED; 74 dev->iamthif_cl.state = MEI_FILE_DISCONNECTED;
74 75
75 /* find ME amthi client */ 76 /* find ME amthi client */
76 i = mei_me_cl_link(dev, &dev->iamthif_cl, 77 i = mei_cl_link_me(&dev->iamthif_cl,
77 &mei_amthi_guid, MEI_IAMTHIF_HOST_CLIENT_ID); 78 &mei_amthi_guid, MEI_IAMTHIF_HOST_CLIENT_ID);
78 if (i < 0) { 79 if (i < 0) {
79 dev_info(&dev->pdev->dev, "failed to find iamthif client.\n"); 80 dev_info(&dev->pdev->dev, "failed to find iamthif client.\n");
@@ -280,7 +281,7 @@ static int mei_amthif_send_cmd(struct mei_device *dev, struct mei_cl_cb *cb)
280 memcpy(dev->iamthif_msg_buf, cb->request_buffer.data, 281 memcpy(dev->iamthif_msg_buf, cb->request_buffer.data,
281 cb->request_buffer.size); 282 cb->request_buffer.size);
282 283
283 ret = mei_flow_ctrl_creds(dev, &dev->iamthif_cl); 284 ret = mei_cl_flow_ctrl_creds(&dev->iamthif_cl);
284 if (ret < 0) 285 if (ret < 0)
285 return ret; 286 return ret;
286 287
@@ -304,7 +305,7 @@ static int mei_amthif_send_cmd(struct mei_device *dev, struct mei_cl_cb *cb)
304 return -ENODEV; 305 return -ENODEV;
305 306
306 if (mei_hdr.msg_complete) { 307 if (mei_hdr.msg_complete) {
307 if (mei_flow_ctrl_reduce(dev, &dev->iamthif_cl)) 308 if (mei_cl_flow_ctrl_reduce(&dev->iamthif_cl))
308 return -ENODEV; 309 return -ENODEV;
309 dev->iamthif_flow_control_pending = true; 310 dev->iamthif_flow_control_pending = true;
310 dev->iamthif_state = MEI_IAMTHIF_FLOW_CONTROL; 311 dev->iamthif_state = MEI_IAMTHIF_FLOW_CONTROL;
@@ -467,7 +468,7 @@ int mei_amthif_irq_write_complete(struct mei_device *dev, s32 *slots,
467 return -ENODEV; 468 return -ENODEV;
468 } 469 }
469 470
470 if (mei_flow_ctrl_reduce(dev, cl)) 471 if (mei_cl_flow_ctrl_reduce(cl))
471 return -ENODEV; 472 return -ENODEV;
472 473
473 dev->iamthif_msg_buf_index += mei_hdr.length; 474 dev->iamthif_msg_buf_index += mei_hdr.length;