aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/misc/mei/main.c
diff options
context:
space:
mode:
authorTomas Winkler <tomas.winkler@intel.com>2013-01-08 16:07:21 -0500
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-01-08 19:40:46 -0500
commit1a1aca42c989051dce34d49b4e04a25dafe01d74 (patch)
tree8fa9d6a80246528736dd6df80df60c7c7eb2619e /drivers/misc/mei/main.c
parent038c8a6ebc50ec981557f02197ed2dc5795c40fb (diff)
mei: rename remaining amthi strings to amthif
the only real thing that left was mei_amthi_guid the rest was in the strings and comments Signed-off-by: Tomas Winkler <tomas.winkler@intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/misc/mei/main.c')
-rw-r--r--drivers/misc/mei/main.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/misc/mei/main.c b/drivers/misc/mei/main.c
index 5c7c85505c91..d5d1a5957d5f 100644
--- a/drivers/misc/mei/main.c
+++ b/drivers/misc/mei/main.c
@@ -497,7 +497,7 @@ static ssize_t mei_write(struct file *file, const char __user *ubuf,
497 497
498 if (rets) { 498 if (rets) {
499 dev_err(&dev->pdev->dev, 499 dev_err(&dev->pdev->dev,
500 "amthi write failed with status = %d\n", rets); 500 "amthif write failed with status = %d\n", rets);
501 goto err; 501 goto err;
502 } 502 }
503 mutex_unlock(&dev->device_lock); 503 mutex_unlock(&dev->device_lock);
@@ -611,10 +611,10 @@ static int mei_ioctl_connect_client(struct file *file,
611 dev_dbg(&dev->pdev->dev, "FW Client - Max Msg Len = %d\n", 611 dev_dbg(&dev->pdev->dev, "FW Client - Max Msg Len = %d\n",
612 dev->me_clients[i].props.max_msg_length); 612 dev->me_clients[i].props.max_msg_length);
613 613
614 /* if we're connecting to amthi client then we will use the 614 /* if we're connecting to amthif client then we will use the
615 * existing connection 615 * existing connection
616 */ 616 */
617 if (uuid_le_cmp(data->in_client_uuid, mei_amthi_guid) == 0) { 617 if (uuid_le_cmp(data->in_client_uuid, mei_amthif_guid) == 0) {
618 dev_dbg(&dev->pdev->dev, "FW Client is amthi\n"); 618 dev_dbg(&dev->pdev->dev, "FW Client is amthi\n");
619 if (dev->iamthif_cl.state != MEI_FILE_CONNECTED) { 619 if (dev->iamthif_cl.state != MEI_FILE_CONNECTED) {
620 rets = -ENODEV; 620 rets = -ENODEV;