[media] vivi: let vb2_poll handle events

The vb2_poll function now tests for events and sets POLLPRI accordingly.
So there it is no longer necessary to test for it in the vivi driver.

Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

diff --git a/drivers/media/video/vivi.c b/drivers/media/video/vivi.c
index 5e8b0710105b370f4e3e9df5b7791bf99b7c9957..b456d3ed11978c40e4cbf0473c0ab4b462f73004 100644 (file)
--- a/drivers/media/video/vivi.c
+++ b/drivers/media/video/vivi.c
@@ -1039,17 +1039,10 @@ static unsigned int
 vivi_poll(struct file *file, struct poll_table_struct *wait)
 {
        struct vivi_dev *dev = video_drvdata(file);
-       struct v4l2_fh *fh = file->private_data;
        struct vb2_queue *q = &dev->vb_vidq;
-       unsigned int res;
 
        dprintk(dev, 1, "%s\n", __func__);
-       res = vb2_poll(q, file, wait);
-       if (v4l2_event_pending(fh))
-               res |= POLLPRI;
-       else
-               poll_wait(file, &fh->wait, wait);
-       return res;
+       return vb2_poll(q, file, wait);
 }
 
 static int vivi_close(struct file *file)