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

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

mei: extract amthif specific code from mei_poll to mei_amthif_poll 



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

drivers/misc/mei/amthif.c

+19 −0
Original line number Diff line number Diff line
@@ -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.

 *

drivers/misc/mei/main.c

+1 −9
Original line number Diff line number Diff line
@@ -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;

	}

drivers/misc/mei/mei_dev.h

+5 −1
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ 


#include <linux/types.h>

#include <linux/watchdog.h>

#include <linux/poll.h>

#include <linux/mei.h>

#include "hw.h"
@@ -389,6 +390,9 @@ 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);



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);



struct mei_cl_cb *mei_amthif_find_read_list_entry(struct mei_device *dev,