Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d91aaed3 authored by Tomas Winkler's avatar Tomas Winkler Committed by Greg Kroah-Hartman
Browse files

mei: drop read_pending member form struct mei_cl 



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

Signed-off-by: default avatarTomas Winkler <tomas.winkler@intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 9dc64d6a

drivers/misc/mei/client.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

	}

drivers/misc/mei/main.c

+1 −3
Original line number Diff line number Diff line
@@ -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);
@@ -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;

drivers/misc/mei/mei_dev.h

+0 −1
Original line number Diff line number Diff line
@@ -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;