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: Tomas Winkler <tomas.winkler@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
diff --git a/drivers/misc/mei/main.c b/drivers/misc/mei/main.c
index d8221a5..ff50cc1 100644
--- a/drivers/misc/mei/main.c
+++ b/drivers/misc/mei/main.c
@@ -620,27 +620,12 @@
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)
+ rets = mei_amthif_write(dev, write_cb);
+
+ if (rets) {
+ dev_err(&dev->pdev->dev,
+ "amthi write failed with status = %d\n", 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);
- goto err;
- }
}
mutex_unlock(&dev->device_lock);
return length;