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

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

mei: move amthif specific code from mei_write to mei_amthif_write 



For sake of amthif consolidation move amthif specific code from
mei_write to mei_amthif_write

The original mei_amthif_write to mei_amthif_send_cmd
as this function deals with sending single command
while mei_amthif_write is interface function called from
the main driver which in turns calls mei_amthif_send_cmd

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

drivers/misc/mei/amthif.c

+36 −3
Original line number Diff line number Diff line
@@ -255,14 +255,15 @@ int mei_amthif_read(struct mei_device *dev, struct file *file, 
}



/**

 * mei_amthif_write - write amthif data to amthif client

 * mei_amthif_send_cmd - send amthif command to the ME

 *

 * @dev: the device structure

 * @cb: mei call back struct

 *

 * returns 0 on success, <0 on failure.

 *

 */

int mei_amthif_write(struct mei_device *dev, struct mei_cl_cb *cb)

static int mei_amthif_send_cmd(struct mei_device *dev, struct mei_cl_cb *cb)

{

	struct mei_msg_hdr mei_hdr;

	int ret;
@@ -328,6 +329,38 @@ int mei_amthif_write(struct mei_device *dev, struct mei_cl_cb *cb) 
	return 0;

}



/**

 * mei_amthif_write - write amthif data to amthif client

 *

 * @dev: the device structure

 * @cb: mei call back struct

 *

 * returns 0 on success, <0 on failure.

 *

 */

int mei_amthif_write(struct mei_device *dev, struct mei_cl_cb *cb)

{

	int ret;



	if (!dev || !cb)

		return -ENODEV;



	ret = mei_io_cb_alloc_resp_buf(cb, dev->iamthif_mtu);

	if (ret)

		return ret;



	cb->major_file_operations = MEI_IOCTL;



	if (!list_empty(&dev->amthi_cmd_list.list) ||

	    dev->iamthif_state != MEI_IAMTHIF_IDLE) {

		dev_dbg(&dev->pdev->dev,

			"amthif state = %d\n", dev->iamthif_state);

		dev_dbg(&dev->pdev->dev, "AMTHIF: add cb to the wait list\n");

		list_add_tail(&cb->list, &dev->amthi_cmd_list.list);

		return 0;

	}

	return mei_amthif_send_cmd(dev, cb);

}

/**

 * mei_amthif_run_next_cmd

 *
@@ -360,7 +393,7 @@ void mei_amthif_run_next_cmd(struct mei_device *dev) 
		cl_tmp = (struct mei_cl *)pos->file_private;



		if (cl_tmp && cl_tmp == &dev->iamthif_cl) {

			status = mei_amthif_write(dev, pos);

			status = mei_amthif_send_cmd(dev, pos);

			if (status) {

				dev_dbg(&dev->pdev->dev,

					"amthi write failed status = %d\n",

drivers/misc/mei/main.c

+5 −20
Original line number Diff line number Diff line
@@ -620,28 +620,13 @@ static ssize_t mei_write(struct file *file, const char __user *ubuf, 
		cl->sm_state |= MEI_WD_STATE_INDEPENDENCE_MSG_SENT;



	if (cl == &dev->iamthif_cl) {

		rets = mei_io_cb_alloc_resp_buf(write_cb, dev->iamthif_mtu);

		if (rets)

			goto err;



		write_cb->major_file_operations = MEI_IOCTL;



		if (!list_empty(&dev->amthi_cmd_list.list) ||

				dev->iamthif_state != MEI_IAMTHIF_IDLE) {

			dev_dbg(&dev->pdev->dev, "amthi_state = %d\n",

					(int) dev->iamthif_state);

			dev_dbg(&dev->pdev->dev, "add amthi cb to amthi cmd waiting list\n");

			list_add_tail(&write_cb->list, &dev->amthi_cmd_list.list);

		} else {

			dev_dbg(&dev->pdev->dev, "call amthi write\n");

		rets = mei_amthif_write(dev, write_cb);



		if (rets) {

				dev_err(&dev->pdev->dev, "amthi write failed with status = %d\n",

				    rets);

			dev_err(&dev->pdev->dev,

				"amthi write failed with status = %d\n", rets);

			goto err;

		}

		}

		mutex_unlock(&dev->device_lock);

		return length;

	}