mei: drop read_pending member form struct mei_cl

read_pending never changes, it is a leftover from the old code.

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

3 files changed, 2 insertions, 5 deletions

diff --git a/drivers/misc/mei/client.c b/drivers/misc/mei/client.c
index e2e9cb7df067..231eda2b09e1 100644
--- a/drivers/misc/mei/client.c
+++ b/drivers/misc/mei/client.c
@@ -631,7 +631,7 @@ int mei_cl_read_start(struct mei_cl *cl)
         if (dev->dev_state != MEI_DEV_ENABLED)
                 return -ENODEV;
 
-        if (cl->read_pending || cl->read_cb) {
+        if (cl->read_cb) {
                 dev_dbg(&dev->pdev->dev, "read is pending.\n");
                 return -EBUSY;
         }
diff --git a/drivers/misc/mei/main.c b/drivers/misc/mei/main.c
index e31ade30086d..5c7c85505c91 100644
--- a/drivers/misc/mei/main.c
+++ b/drivers/misc/mei/main.c
@@ -380,7 +380,6 @@ free:
         mei_io_cb_free(cb);
         cl->reading_state = MEI_IDLE;
         cl->read_cb = NULL;
-        cl->read_pending = 0;
 out:
         dev_dbg(&dev->pdev->dev, "end mei read rets= %d\n", rets);
         mutex_unlock(&dev->device_lock);
@@ -462,9 +461,8 @@ static ssize_t mei_write(struct file *file, const char __user *ubuf,
                         write_cb = NULL;
                         cl->reading_state = MEI_IDLE;
                         cl->read_cb = NULL;
-                        cl->read_pending = 0;
                 }
-        } else if (cl->reading_state == MEI_IDLE && !cl->read_pending)
+        } else if (cl->reading_state == MEI_IDLE)
                 *offset = 0;
 
 
diff --git a/drivers/misc/mei/mei_dev.h b/drivers/misc/mei/mei_dev.h
index 87b1f6a1a1dd..11ff875e8658 100644
--- a/drivers/misc/mei/mei_dev.h
+++ b/drivers/misc/mei/mei_dev.h
@@ -199,7 +199,6 @@ struct mei_cl {
         wait_queue_head_t tx_wait;
         wait_queue_head_t rx_wait;
         wait_queue_head_t wait;
-        int read_pending;
         int status;
         /* ID of client connected */
         u8 host_client_id;