Skip to content

Commit

Permalink
mei: drop read_pending member form struct mei_cl
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Tomas Winkler authored and Greg Kroah-Hartman committed Jan 9, 2013
1 parent 9dc64d6 commit d91aaed
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 5 deletions.
2 changes: 1 addition & 1 deletion drivers/misc/mei/client.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
4 changes: 1 addition & 3 deletions drivers/misc/mei/main.c
Original file line number Diff line number Diff line change
Expand Up @@ -380,7 +380,6 @@ static ssize_t mei_read(struct file *file, char __user *ubuf,
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);
Expand Down Expand Up @@ -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;


Expand Down
1 change: 0 additions & 1 deletion drivers/misc/mei/mei_dev.h
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit d91aaed

Please sign in to comment.