mei: drop iamthif_mtu from device structure

We can receive mtu with one call now, no need to store it.

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

diff --git a/drivers/misc/mei/amthif.c b/drivers/misc/mei/amthif.c
index 3c69616b2fa8b6477a7c4670d67b57fb3690e90e..1e42781592d85794bf0f0c0ae3aacfcc5010bec0 100644 (file)
--- a/drivers/misc/mei/amthif.c
+++ b/drivers/misc/mei/amthif.c
@@ -72,12 +72,6 @@ int mei_amthif_host_init(struct mei_device *dev, struct mei_me_client *me_cl)
 
        mei_cl_init(cl, dev);
 
-       /* 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);
@@ -239,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);
@@ -248,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;
 

diff --git a/drivers/misc/mei/mei_dev.h b/drivers/misc/mei/mei_dev.h
index fa5ce1de20f69d31c7d59817ab59a952731d2d30..79ab781845231b0f5a6c8535d9e0335e73624a09 100644 (file)
--- a/drivers/misc/mei/mei_dev.h
+++ b/drivers/misc/mei/mei_dev.h
@@ -490,7 +490,6 @@ const char *mei_pg_state_str(enum mei_pg_state state);
  * @iamthif_cl  : amthif host client
  * @iamthif_current_cb : amthif current operation callback
  * @iamthif_open_count : number of opened amthif connections
- * @iamthif_mtu : amthif client max message length
  * @iamthif_timer : time stamp of current amthif command completion
  * @iamthif_stall_timer : timer to detect amthif hang
  * @iamthif_state : amthif processor state
@@ -586,7 +585,6 @@ struct mei_device {
        struct mei_cl iamthif_cl;
        struct mei_cl_cb *iamthif_current_cb;
        long iamthif_open_count;
-       int iamthif_mtu;
        unsigned long iamthif_timer;
        u32 iamthif_stall_timer;
        enum iamthif_states iamthif_state;