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

Commit c23e0cb8 authored by Al Viro's avatar Al Viro
Browse files

media: annotate ->poll() instances 



Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent 076ccb76

drivers/media/cec/cec-api.c

+2 −2
Original line number Diff line number Diff line
@@ -43,13 +43,13 @@ static inline struct cec_devnode *cec_devnode_data(struct file *filp) 


/* CEC file operations */



static unsigned int cec_poll(struct file *filp,

static __poll_t cec_poll(struct file *filp,

			     struct poll_table_struct *poll)

{

	struct cec_devnode *devnode = cec_devnode_data(filp);

	struct cec_fh *fh = filp->private_data;

	struct cec_adapter *adap = fh->adap;

	unsigned int res = 0;

	__poll_t res = 0;



	if (!devnode->registered)

		return POLLERR | POLLHUP;

drivers/media/common/saa7146/saa7146_fops.c

+4 −4
Original line number Diff line number Diff line
@@ -320,13 +320,13 @@ static int fops_mmap(struct file *file, struct vm_area_struct * vma) 
	return res;

}



static unsigned int __fops_poll(struct file *file, struct poll_table_struct *wait)

static __poll_t __fops_poll(struct file *file, struct poll_table_struct *wait)

{

	struct video_device *vdev = video_devdata(file);

	struct saa7146_fh *fh = file->private_data;

	struct videobuf_buffer *buf = NULL;

	struct videobuf_queue *q;

	unsigned int res = v4l2_ctrl_poll(file, wait);

	__poll_t res = v4l2_ctrl_poll(file, wait);



	DEB_EE("file:%p, poll:%p\n", file, wait);
@@ -359,10 +359,10 @@ static unsigned int __fops_poll(struct file *file, struct poll_table_struct *wai 
	return res;

}



static unsigned int fops_poll(struct file *file, struct poll_table_struct *wait)

static __poll_t fops_poll(struct file *file, struct poll_table_struct *wait)

{

	struct video_device *vdev = video_devdata(file);

	unsigned int res;

	__poll_t res;



	mutex_lock(vdev->lock);

	res = __fops_poll(file, wait);

drivers/media/common/siano/smsdvb-debugfs.c

+2 −5
Original line number Diff line number Diff line
@@ -374,7 +374,7 @@ static int smsdvb_stats_wait_read(struct smsdvb_debugfs *debug_data) 
	return rc;

}



static unsigned int smsdvb_stats_poll(struct file *file, poll_table *wait)

static __poll_t smsdvb_stats_poll(struct file *file, poll_table *wait)

{

	struct smsdvb_debugfs *debug_data = file->private_data;

	int rc;
@@ -384,12 +384,9 @@ static unsigned int smsdvb_stats_poll(struct file *file, poll_table *wait) 
	poll_wait(file, &debug_data->stats_queue, wait);



	rc = smsdvb_stats_wait_read(debug_data);

	if (rc > 0)

		rc = POLLIN | POLLRDNORM;



	kref_put(&debug_data->refcount, smsdvb_debugfs_data_release);



	return rc;

	return rc > 0 ? POLLIN | POLLRDNORM : 0;

}



static ssize_t smsdvb_stats_read(struct file *file, char __user *user_buf,

drivers/media/dvb-core/dmxdev.c

+4 −4
Original line number Diff line number Diff line
@@ -1066,10 +1066,10 @@ static long dvb_demux_ioctl(struct file *file, unsigned int cmd, 
	return dvb_usercopy(file, cmd, arg, dvb_demux_do_ioctl);

}



static unsigned int dvb_demux_poll(struct file *file, poll_table *wait)

static __poll_t dvb_demux_poll(struct file *file, poll_table *wait)

{

	struct dmxdev_filter *dmxdevfilter = file->private_data;

	unsigned int mask = 0;

	__poll_t mask = 0;



	if ((!dmxdevfilter) || dmxdevfilter->dev->exit)

		return POLLERR;
@@ -1160,11 +1160,11 @@ static long dvb_dvr_ioctl(struct file *file, 
	return dvb_usercopy(file, cmd, arg, dvb_dvr_do_ioctl);

}



static unsigned int dvb_dvr_poll(struct file *file, poll_table *wait)

static __poll_t dvb_dvr_poll(struct file *file, poll_table *wait)

{

	struct dvb_device *dvbdev = file->private_data;

	struct dmxdev *dmxdev = dvbdev->priv;

	unsigned int mask = 0;

	__poll_t mask = 0;



	dprintk("%s\n", __func__);

drivers/media/dvb-core/dvb_ca_en50221.c

+2 −2
Original line number Diff line number Diff line
@@ -1783,11 +1783,11 @@ static int dvb_ca_en50221_io_release(struct inode *inode, struct file *file) 
 *

 * @return Standard poll mask.

 */

static unsigned int dvb_ca_en50221_io_poll(struct file *file, poll_table *wait)

static __poll_t dvb_ca_en50221_io_poll(struct file *file, poll_table *wait)

{

	struct dvb_device *dvbdev = file->private_data;

	struct dvb_ca_private *ca = dvbdev->priv;

	unsigned int mask = 0;

	__poll_t mask = 0;

	int slot;

	int result = 0;