mei: get rid of most of the pci dependencies in mei

For purpose of adding testing HW we would like
to get rid of pci dependency in generic mei code
This patch provides only straight forward changes
FW status and prob quirks need to be handled separately

Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

1 files changed, 20 insertions, 20 deletions

diff --git a/drivers/misc/mei/main.c b/drivers/misc/mei/main.c
index 244fb6bf7463..4d738c881878 100644
--- a/drivers/misc/mei/main.c
+++ b/drivers/misc/mei/main.c
@@ -63,7 +63,7 @@ static int mei_open(struct inode *inode, struct file *file)
 
         err = -ENODEV;
         if (dev->dev_state != MEI_DEV_ENABLED) {
-                dev_dbg(&dev->pdev->dev, "dev_state != MEI_ENABLED  dev_state = %s\n",
+                dev_dbg(dev->dev, "dev_state != MEI_ENABLED  dev_state = %s\n",
                     mei_dev_state_str(dev->dev_state));
                 goto err_unlock;
         }
@@ -211,7 +211,7 @@ static ssize_t mei_read(struct file *file, char __user *ubuf,
 
         err = mei_cl_read_start(cl, length);
         if (err && err != -EBUSY) {
-                dev_dbg(&dev->pdev->dev,
+                dev_dbg(dev->dev,
                         "mei start read failure with status = %d\n", err);
                 rets = err;
                 goto out;
@@ -254,7 +254,7 @@ static ssize_t mei_read(struct file *file, char __user *ubuf,
         }
         /* now copy the data to user space */
 copy_buffer:
-        dev_dbg(&dev->pdev->dev, "buf.size = %d buf.idx= %ld\n",
+        dev_dbg(dev->dev, "buf.size = %d buf.idx= %ld\n",
             cb->response_buffer.size, cb->buf_idx);
         if (length == 0 || ubuf == NULL || *offset > cb->buf_idx) {
                 rets = -EMSGSIZE;
@@ -266,7 +266,7 @@ copy_buffer:
         length = min_t(size_t, length, cb->buf_idx - *offset);
 
         if (copy_to_user(ubuf, cb->response_buffer.data + *offset, length)) {
-                dev_dbg(&dev->pdev->dev, "failed to copy data to userland\n");
+                dev_dbg(dev->dev, "failed to copy data to userland\n");
                 rets = -EFAULT;
                 goto free;
         }
@@ -285,7 +285,7 @@ free:
         cl->reading_state = MEI_IDLE;
         cl->read_cb = NULL;
 out:
-        dev_dbg(&dev->pdev->dev, "end mei read rets= %d\n", rets);
+        dev_dbg(dev->dev, "end mei read rets= %d\n", rets);
         mutex_unlock(&dev->device_lock);
         return rets;
 }
@@ -338,7 +338,7 @@ static ssize_t mei_write(struct file *file, const char __user *ubuf,
         }
 
         if (cl->state != MEI_FILE_CONNECTED) {
-                dev_err(&dev->pdev->dev, "host client = %d,  is not connected to ME client = %d",
+                dev_err(dev->dev, "host client = %d,  is not connected to ME client = %d",
                         cl->host_client_id, cl->me_client_id);
                 rets = -ENODEV;
                 goto out;
@@ -386,7 +386,7 @@ static ssize_t mei_write(struct file *file, const char __user *ubuf,
 
         rets = copy_from_user(write_cb->request_buffer.data, ubuf, length);
         if (rets) {
-                dev_dbg(&dev->pdev->dev, "failed to copy data from userland\n");
+                dev_dbg(dev->dev, "failed to copy data from userland\n");
                 rets = -EFAULT;
                 goto out;
         }
@@ -395,7 +395,7 @@ static ssize_t mei_write(struct file *file, const char __user *ubuf,
                 rets = mei_amthif_write(dev, write_cb);
 
                 if (rets) {
-                        dev_err(&dev->pdev->dev,
+                        dev_err(dev->dev,
                                 "amthif write failed with status = %d\n", rets);
                         goto out;
                 }
@@ -448,7 +448,7 @@ static int mei_ioctl_connect_client(struct file *file,
         /* find ME client we're trying to connect to */
         me_cl = mei_me_cl_by_uuid(dev, &data->in_client_uuid);
         if (!me_cl || me_cl->props.fixed_address) {
-                dev_dbg(&dev->pdev->dev, "Cannot connect to FW Client UUID = %pUl\n",
+                dev_dbg(dev->dev, "Cannot connect to FW Client UUID = %pUl\n",
                                 &data->in_client_uuid);
                 rets = -ENOTTY;
                 goto end;
@@ -457,18 +457,18 @@ static int mei_ioctl_connect_client(struct file *file,
         cl->me_client_id = me_cl->client_id;
         cl->cl_uuid = me_cl->props.protocol_name;
 
-        dev_dbg(&dev->pdev->dev, "Connect to FW Client ID = %d\n",
+        dev_dbg(dev->dev, "Connect to FW Client ID = %d\n",
                         cl->me_client_id);
-        dev_dbg(&dev->pdev->dev, "FW Client - Protocol Version = %d\n",
+        dev_dbg(dev->dev, "FW Client - Protocol Version = %d\n",
                         me_cl->props.protocol_version);
-        dev_dbg(&dev->pdev->dev, "FW Client - Max Msg Len = %d\n",
+        dev_dbg(dev->dev, "FW Client - Max Msg Len = %d\n",
                         me_cl->props.max_msg_length);
 
         /* if we're connecting to amthif client then we will use the
          * existing connection
          */
         if (uuid_le_cmp(data->in_client_uuid, mei_amthif_guid) == 0) {
-                dev_dbg(&dev->pdev->dev, "FW Client is amthi\n");
+                dev_dbg(dev->dev, "FW Client is amthi\n");
                 if (dev->iamthif_cl.state != MEI_FILE_CONNECTED) {
                         rets = -ENODEV;
                         goto end;
@@ -493,7 +493,7 @@ static int mei_ioctl_connect_client(struct file *file,
         client = &data->out_client_properties;
         client->max_msg_length = me_cl->props.max_msg_length;
         client->protocol_version = me_cl->props.protocol_version;
-        dev_dbg(&dev->pdev->dev, "Can connect?\n");
+        dev_dbg(dev->dev, "Can connect?\n");
 
 
         rets = mei_cl_connect(cl, file);
@@ -524,7 +524,7 @@ static long mei_ioctl(struct file *file, unsigned int cmd, unsigned long data)
 
         dev = cl->dev;
 
-        dev_dbg(&dev->pdev->dev, "IOCTL cmd = 0x%x", cmd);
+        dev_dbg(dev->dev, "IOCTL cmd = 0x%x", cmd);
 
         mutex_lock(&dev->device_lock);
         if (dev->dev_state != MEI_DEV_ENABLED) {
@@ -534,10 +534,10 @@ static long mei_ioctl(struct file *file, unsigned int cmd, unsigned long data)
 
         switch (cmd) {
         case IOCTL_MEI_CONNECT_CLIENT:
-                dev_dbg(&dev->pdev->dev, ": IOCTL_MEI_CONNECT_CLIENT.\n");
+                dev_dbg(dev->dev, ": IOCTL_MEI_CONNECT_CLIENT.\n");
                 if (copy_from_user(&connect_data, (char __user *)data,
                                 sizeof(struct mei_connect_client_data))) {
-                        dev_dbg(&dev->pdev->dev, "failed to copy data from userland\n");
+                        dev_dbg(dev->dev, "failed to copy data from userland\n");
                         rets = -EFAULT;
                         goto out;
                 }
@@ -549,7 +549,7 @@ static long mei_ioctl(struct file *file, unsigned int cmd, unsigned long data)
                 /* if all is ok, copying the data back to user. */
                 if (copy_to_user((char __user *)data, &connect_data,
                                 sizeof(struct mei_connect_client_data))) {
-                        dev_dbg(&dev->pdev->dev, "failed to copy data to userland\n");
+                        dev_dbg(dev->dev, "failed to copy data to userland\n");
                         rets = -EFAULT;
                         goto out;
                 }
@@ -557,7 +557,7 @@ static long mei_ioctl(struct file *file, unsigned int cmd, unsigned long data)
                 break;
 
         default:
-                dev_err(&dev->pdev->dev, ": unsupported ioctl %d.\n", cmd);
+                dev_err(dev->dev, ": unsupported ioctl %d.\n", cmd);
                 rets = -ENOIOCTLCMD;
         }
 
@@ -671,7 +671,7 @@ static int mei_minor_get(struct mei_device *dev)
         if (ret >= 0)
                 dev->minor = ret;
         else if (ret == -ENOSPC)
-                dev_err(&dev->pdev->dev, "too many mei devices\n");
+                dev_err(dev->dev, "too many mei devices\n");
 
         mutex_unlock(&mei_minor_lock);
         return ret;