OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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>
This commit is contained in:
Tomas Winkler 2013-01-08 23:07:18 +02:00 committed by Greg Kroah-Hartman
parent 9dc64d6a26
commit d91aaed30a
3 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/misc/mei/client.c
View File

@ -631,7 +631,7 @@ int mei_cl_read_start(struct mei_cl *cl)
if (dev->dev_state != MEI_DEV_ENABLED) if (dev->dev_state != MEI_DEV_ENABLED)
return -ENODEV; return -ENODEV;
if (cl->read_pending || cl->read_cb) { if (cl->read_cb) {
dev_dbg(&dev->pdev->dev, "read is pending.\n"); dev_dbg(&dev->pdev->dev, "read is pending.\n");
return -EBUSY; return -EBUSY;
} }

4
drivers/misc/mei/main.c
View File

@ -380,7 +380,6 @@ free:
mei_io_cb_free(cb); mei_io_cb_free(cb);
cl->reading_state = MEI_IDLE; cl->reading_state = MEI_IDLE;
cl->read_cb = NULL; cl->read_cb = NULL;
cl->read_pending = 0;
out: out:
dev_dbg(&dev->pdev->dev, "end mei read rets= %d\n", rets); dev_dbg(&dev->pdev->dev, "end mei read rets= %d\n", rets);
mutex_unlock(&dev->device_lock); mutex_unlock(&dev->device_lock);
@ -462,9 +461,8 @@ static ssize_t mei_write(struct file *file, const char __user *ubuf,
write_cb = NULL; write_cb = NULL;
cl->reading_state = MEI_IDLE; cl->reading_state = MEI_IDLE;
cl->read_cb = NULL; 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; *offset = 0;

1
drivers/misc/mei/mei_dev.h
View File

@ -199,7 +199,6 @@ struct mei_cl {
wait_queue_head_t tx_wait; wait_queue_head_t tx_wait;
wait_queue_head_t rx_wait; wait_queue_head_t rx_wait;
wait_queue_head_t wait; wait_queue_head_t wait;
int read_pending;
int status; int status;
/* ID of client connected */ /* ID of client connected */
u8 host_client_id; u8 host_client_id;