[media] v4l2-events/fh: merge v4l2_events into v4l2_fh

Drivers that supported events used to be rare, but now that controls can also
raise events this will become much more common since almost all drivers have
controls.

This means that keeping struct v4l2_events as a separate struct make no more
sense. Merging it into struct v4l2_fh simplifies things substantially as it
is now an integral part of the filehandle struct.

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

1 files changed, 2 insertions, 8 deletions

diff --git a/drivers/media/video/v4l2-subdev.c b/drivers/media/video/v4l2-subdev.c
index fd5dccaf3519..3b67a8584916 100644
--- a/drivers/media/video/v4l2-subdev.c
+++ b/drivers/media/video/v4l2-subdev.c
@@ -75,15 +75,9 @@ static int subdev_open(struct file *file)
                 return ret;
         }
 
-        ret = v4l2_fh_init(&subdev_fh->vfh, vdev);
-        if (ret)
-                goto err;
+        v4l2_fh_init(&subdev_fh->vfh, vdev);
 
         if (sd->flags & V4L2_SUBDEV_FL_HAS_EVENTS) {
-                ret = v4l2_event_init(&subdev_fh->vfh);
-                if (ret)
-                        goto err;
-
                 ret = v4l2_event_alloc(&subdev_fh->vfh, sd->nevents);
                 if (ret)
                         goto err;
@@ -297,7 +291,7 @@ static unsigned int subdev_poll(struct file *file, poll_table *wait)
         if (!(sd->flags & V4L2_SUBDEV_FL_HAS_EVENTS))
                 return POLLERR;
 
-        poll_wait(file, &fh->events->wait, wait);
+        poll_wait(file, &fh->wait, wait);
 
         if (v4l2_event_pending(fh))
                 return POLLPRI;