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

mei: use mei_cl_is_connected consistently 



Replace open coded check for cl->state !=/== MEI_FILE_CONNECTED
with mei_cl_is_connected function.

Note that cl->state != MEI_FILE_CONNECTED is not the same
as cl->state == MEI_FILE_DISCONNECTED

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

drivers/misc/mei/bus.c

+2 −2
Original line number Diff line number Diff line
@@ -238,7 +238,7 @@ static ssize_t ___mei_cl_send(struct mei_cl *cl, u8 *buf, size_t length, 
	dev = cl->dev;



	mutex_lock(&dev->device_lock);

	if (cl->state != MEI_FILE_CONNECTED) {

	if (!mei_cl_is_connected(cl)) {

		rets = -ENODEV;

		goto out;

	}
@@ -474,7 +474,7 @@ int mei_cl_disable_device(struct mei_cl_device *device) 


	mutex_lock(&dev->device_lock);



	if (cl->state != MEI_FILE_CONNECTED) {

	if (!mei_cl_is_connected(cl)) {

		dev_err(dev->dev, "Already disconnected");

		err = 0;

		goto out;

drivers/misc/mei/client.c

+1 −1
Original line number Diff line number Diff line
@@ -876,7 +876,7 @@ int mei_cl_connect(struct mei_cl *cl, struct file *file) 
			mei_secs_to_jiffies(MEI_CL_CONNECT_TIMEOUT));

	mutex_lock(&dev->device_lock);



	if (cl->state != MEI_FILE_CONNECTED) {

	if (!mei_cl_is_connected(cl)) {

		cl->state = MEI_FILE_DISCONNECTED;

		/* something went really wrong */

		if (!cl->status)

drivers/misc/mei/interrupt.c

+1 −1
Original line number Diff line number Diff line
@@ -110,7 +110,7 @@ int mei_cl_irq_read_msg(struct mei_cl *cl, 
		goto out;

	}



	if (cl->state != MEI_FILE_CONNECTED) {

	if (!mei_cl_is_connected(cl)) {

		cl_dbg(dev, cl, "not connected\n");

		cb->status = -ENODEV;

		goto out;

drivers/misc/mei/main.c

+7 −6
Original line number Diff line number Diff line
@@ -107,7 +107,7 @@ static int mei_release(struct inode *inode, struct file *file) 
		rets = mei_amthif_release(dev, file);

		goto out;

	}

	if (cl->state == MEI_FILE_CONNECTED) {

	if (mei_cl_is_connected(cl)) {

		cl->state = MEI_FILE_DISCONNECTING;

		cl_dbg(dev, cl, "disconnecting\n");

		rets = mei_cl_disconnect(cl);
@@ -309,9 +309,8 @@ static ssize_t mei_write(struct file *file, const char __user *ubuf, 
		goto out;

	}



	if (cl->state != MEI_FILE_CONNECTED) {

		dev_err(dev->dev, "host client = %d,  is not connected to ME client = %d",

			cl->host_client_id, cl->me_client_id);

	if (!mei_cl_is_connected(cl)) {

		cl_err(dev, cl, "is not connected");

		rets = -ENODEV;

		goto out;

	}
@@ -418,7 +417,7 @@ static int mei_ioctl_connect_client(struct file *file, 
	 */

	if (uuid_le_cmp(data->in_client_uuid, mei_amthif_guid) == 0) {

		dev_dbg(dev->dev, "FW Client is amthi\n");

		if (dev->iamthif_cl.state != MEI_FILE_CONNECTED) {

		if (!mei_cl_is_connected(&dev->iamthif_cl)) {

			rets = -ENODEV;

			goto end;

		}
@@ -554,7 +553,9 @@ static unsigned int mei_poll(struct file *file, poll_table *wait) 


	mutex_lock(&dev->device_lock);



	if (!mei_cl_is_connected(cl)) {



	if (dev->dev_state != MEI_DEV_ENABLED ||

	    !mei_cl_is_connected(cl)) {

		mask = POLLERR;

		goto out;

	}

drivers/misc/mei/wd.c

+11 −7
Original line number Diff line number Diff line
@@ -160,9 +160,10 @@ int mei_wd_send(struct mei_device *dev) 
 */

int mei_wd_stop(struct mei_device *dev)

{

	struct mei_cl *cl = &dev->wd_cl;

	int ret;



	if (dev->wd_cl.state != MEI_FILE_CONNECTED ||

	if (!mei_cl_is_connected(cl) ||

	    dev->wd_state != MEI_WD_RUNNING)

		return 0;
@@ -170,7 +171,7 @@ int mei_wd_stop(struct mei_device *dev) 


	dev->wd_state = MEI_WD_STOPPING;



	ret = mei_cl_flow_ctrl_creds(&dev->wd_cl);

	ret = mei_cl_flow_ctrl_creds(cl);

	if (ret < 0)

		goto err;
@@ -211,13 +212,16 @@ int mei_wd_stop(struct mei_device *dev) 
 */

static int mei_wd_ops_start(struct watchdog_device *wd_dev)

{

	int err = -ENODEV;

	struct mei_device *dev;

	struct mei_cl *cl;

	int err = -ENODEV;



	dev = watchdog_get_drvdata(wd_dev);

	if (!dev)

		return -ENODEV;



	cl = &dev->wd_cl;



	mutex_lock(&dev->device_lock);



	if (dev->dev_state != MEI_DEV_ENABLED) {
@@ -226,8 +230,8 @@ static int mei_wd_ops_start(struct watchdog_device *wd_dev) 
		goto end_unlock;

	}



	if (dev->wd_cl.state != MEI_FILE_CONNECTED)	{

		dev_dbg(dev->dev, "MEI Driver is not connected to Watchdog Client\n");

	if (!mei_cl_is_connected(cl)) {

		cl_dbg(dev, cl, "MEI Driver is not connected to Watchdog Client\n");

		goto end_unlock;

	}
@@ -282,8 +286,8 @@ static int mei_wd_ops_ping(struct watchdog_device *wd_dev) 


	mutex_lock(&dev->device_lock);



	if (cl->state != MEI_FILE_CONNECTED) {

		dev_err(dev->dev, "wd: not connected.\n");

	if (!mei_cl_is_connected(cl)) {

		cl_err(dev, cl, "wd: not connected.\n");

		ret = -ENODEV;

		goto end;

	}