These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / drivers / misc / mei / amthif.c

diff --git a/kernel/drivers/misc/mei/amthif.c b/kernel/drivers/misc/mei/amthif.c
index d2cd53e..cd0403f 100644 (file)
--- a/kernel/drivers/misc/mei/amthif.c
+++ b/kernel/drivers/misc/mei/amthif.c
@@ -59,46 +59,29 @@ void mei_amthif_reset_params(struct mei_device *dev)
  * mei_amthif_host_init - mei initialization amthif client.
  *
  * @dev: the device structure
+ * @me_cl: me client
  *
  * Return: 0 on success, <0 on failure.
  */
-int mei_amthif_host_init(struct mei_device *dev)
+int mei_amthif_host_init(struct mei_device *dev, struct mei_me_client *me_cl)
 {
        struct mei_cl *cl = &dev->iamthif_cl;
-       struct mei_me_client *me_cl;
        int ret;
 
        dev->iamthif_state = MEI_IAMTHIF_IDLE;
 
        mei_cl_init(cl, dev);
 
-       me_cl = mei_me_cl_by_uuid(dev, &mei_amthif_guid);
-       if (!me_cl) {
-               dev_info(dev->dev, "amthif: failed to find the client");
-               return -ENOTTY;
-       }
-
-       cl->me_client_id = me_cl->client_id;
-       cl->cl_uuid = me_cl->props.protocol_name;
-
-       /* Assign iamthif_mtu to the value received from ME  */
-
-       dev->iamthif_mtu = me_cl->props.max_msg_length;
-       dev_dbg(dev->dev, "IAMTHIF_MTU = %d\n", dev->iamthif_mtu);
-
-
        ret = mei_cl_link(cl, MEI_IAMTHIF_HOST_CLIENT_ID);
        if (ret < 0) {
                dev_err(dev->dev, "amthif: failed cl_link %d\n", ret);
-               goto out;
+               return ret;
        }
 
-       ret = mei_cl_connect(cl, NULL);
+       ret = mei_cl_connect(cl, me_cl, NULL);
 
        dev->iamthif_state = MEI_IAMTHIF_IDLE;
 
-out:
-       mei_me_cl_put(me_cl);
        return ret;
 }
 
@@ -250,7 +233,6 @@ static int mei_amthif_read_start(struct mei_cl *cl, struct file *file)
 {
        struct mei_device *dev = cl->dev;
        struct mei_cl_cb *cb;
-       size_t length = dev->iamthif_mtu;
        int rets;
 
        cb = mei_io_cb_init(cl, MEI_FOP_READ, file);
@@ -259,7 +241,7 @@ static int mei_amthif_read_start(struct mei_cl *cl, struct file *file)
                goto err;
        }
 
-       rets = mei_io_cb_alloc_buf(cb, length);
+       rets = mei_io_cb_alloc_buf(cb, mei_cl_mtu(cl));
        if (rets)
                goto err;
 
@@ -476,7 +458,7 @@ void mei_amthif_complete(struct mei_device *dev, struct mei_cl_cb *cb)
                return;
        }
 
-       if (dev->iamthif_canceled != 1) {
+       if (!dev->iamthif_canceled) {
                dev->iamthif_state = MEI_IAMTHIF_READ_COMPLETE;
                dev->iamthif_stall_timer = 0;
                list_add_tail(&cb->list, &dev->amthif_rd_complete_list.list);