mei: extract amthif specific code from mei_poll to mei_amthif_poll

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

3 files changed, 25 insertions, 10 deletions

diff --git a/drivers/misc/mei/amthif.c b/drivers/misc/mei/amthif.c
index 8f4373aa9e24..7416241dce88 100644
--- a/drivers/misc/mei/amthif.c
+++ b/drivers/misc/mei/amthif.c
@@ -401,6 +401,25 @@ void mei_amthif_run_next_cmd(struct mei_device *dev)
         }
 }
 
+
+unsigned int mei_amthif_poll(struct mei_device *dev,
+                struct file *file, poll_table *wait)
+{
+        unsigned int mask = 0;
+        mutex_unlock(&dev->device_lock);
+        poll_wait(file, &dev->iamthif_cl.wait, wait);
+        mutex_lock(&dev->device_lock);
+        if (dev->iamthif_state == MEI_IAMTHIF_READ_COMPLETE &&
+                dev->iamthif_file_object == file) {
+                mask |= (POLLIN | POLLRDNORM);
+                dev_dbg(&dev->pdev->dev, "run next amthi cb\n");
+                mei_amthif_run_next_cmd(dev);
+        }
+        return mask;
+}
+
+
+
 /**
  * mei_amthif_irq_process_completed - processes completed iamthif operation.
  *
diff --git a/drivers/misc/mei/main.c b/drivers/misc/mei/main.c
index 43512e517952..2cc1ebb131ba 100644
--- a/drivers/misc/mei/main.c
+++ b/drivers/misc/mei/main.c
@@ -694,15 +694,7 @@ static unsigned int mei_poll(struct file *file, poll_table *wait)
 
 
         if (cl == &dev->iamthif_cl) {
-                mutex_unlock(&dev->device_lock);
-                poll_wait(file, &dev->iamthif_cl.wait, wait);
-                mutex_lock(&dev->device_lock);
-                if (dev->iamthif_state == MEI_IAMTHIF_READ_COMPLETE &&
-                        dev->iamthif_file_object == file) {
-                        mask |= (POLLIN | POLLRDNORM);
-                        dev_dbg(&dev->pdev->dev, "run next amthi cb\n");
-                        mei_amthif_run_next_cmd(dev);
-                }
+                mask = mei_amthif_poll(dev, file, wait);
                 goto out;
         }
 
diff --git a/drivers/misc/mei/mei_dev.h b/drivers/misc/mei/mei_dev.h
index bdad35e7aa54..dad85f3fe390 100644
--- a/drivers/misc/mei/mei_dev.h
+++ b/drivers/misc/mei/mei_dev.h
@@ -19,6 +19,7 @@
 
 #include <linux/types.h>
 #include <linux/watchdog.h>
+#include <linux/poll.h>
 #include <linux/mei.h>
 #include "hw.h"
 
@@ -387,7 +388,10 @@ void mei_amthif_host_init(struct mei_device *dev);
 int mei_amthif_write(struct mei_device *dev, struct mei_cl_cb *priv_cb);
 
 int mei_amthif_read(struct mei_device *dev, struct file *file,
-              char __user *ubuf, size_t length, loff_t *offset);
+                char __user *ubuf, size_t length, loff_t *offset);
+
+unsigned int mei_amthif_poll(struct mei_device *dev,
+                struct file *file, poll_table *wait);
 
 int mei_amthif_release(struct mei_device *dev, struct file *file);