[media] v4l2-ctrls/event: remove struct v4l2_ctrl_fh, instead use v4l2_subscribed_event

The v4l2_ctrl_fh struct connected v4l2_ctrl with v4l2_fh so the control
would know which filehandles subscribed to it. However, it is much easier
to use struct v4l2_subscribed_event directly for that and get rid of that
intermediate struct.

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

1 files changed, 9 insertions, 0 deletions

diff --git a/include/media/v4l2-event.h b/include/media/v4l2-event.h
index 042b893035de..eda17f8d78bc 100644
--- a/include/media/v4l2-event.h
+++ b/include/media/v4l2-event.h
@@ -38,9 +38,18 @@ struct v4l2_kevent {
 };
 
 struct v4l2_subscribed_event {
+        /* list node for the v4l2_fh->subscribed list */
         struct list_head        list;
+        /* event type */
         u32                     type;
+        /* associated object ID (e.g. control ID) */
         u32                     id;
+        /* copy of v4l2_event_subscription->flags */
+        u32                     flags;
+        /* filehandle that subscribed to this event */
+        struct v4l2_fh          *fh;
+        /* list node that hooks into the object's event list (if there is one) */
+        struct list_head        node;
 };
 
 int v4l2_event_alloc(struct v4l2_fh *fh, unsigned int n);