[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>

2 files changed, 16 insertions, 10 deletions

diff --git a/include/media/v4l2-ctrls.h b/include/media/v4l2-ctrls.h
index 8f08c6edf509..a15e9098f98b 100644
--- a/include/media/v4l2-ctrls.h
+++ b/include/media/v4l2-ctrls.h
@@ -31,6 +31,7 @@ struct v4l2_ctrl;
 struct video_device;
 struct v4l2_subdev;
 struct v4l2_event_subscription;
+struct v4l2_subscribed_event;
 struct v4l2_fh;
 
 /** struct v4l2_ctrl_ops - The control operations that the driver has to provide.
@@ -53,6 +54,7 @@ struct v4l2_ctrl_ops {
 
 /** struct v4l2_ctrl - The control structure.
   * @node:      The list node.
+  * @ev_subs:   The list of control event subscriptions.
   * @handler:   The handler that owns the control.
   * @cluster:   Point to start of cluster array.
   * @ncontrols: Number of controls in cluster array.
@@ -108,7 +110,7 @@ struct v4l2_ctrl_ops {
 struct v4l2_ctrl {
         /* Administrative fields */
         struct list_head node;
-        struct list_head fhs;
+        struct list_head ev_subs;
         struct v4l2_ctrl_handler *handler;
         struct v4l2_ctrl **cluster;
         unsigned ncontrols;
@@ -184,11 +186,6 @@ struct v4l2_ctrl_handler {
         int error;
 };
 
-struct v4l2_ctrl_fh {
-        struct list_head node;
-        struct v4l2_fh *fh;
-};
-
 /** struct v4l2_ctrl_config - Control configuration structure.
   * @ops:       The control ops.
   * @id:        The control ID.
@@ -497,10 +494,10 @@ s32 v4l2_ctrl_g_ctrl(struct v4l2_ctrl *ctrl);
 int v4l2_ctrl_s_ctrl(struct v4l2_ctrl *ctrl, s32 val);
 
 /* Internal helper functions that deal with control events. */
-void v4l2_ctrl_add_fh(struct v4l2_ctrl_handler *hdl,
-                struct v4l2_ctrl_fh *ctrl_fh,
-                struct v4l2_event_subscription *sub);
-void v4l2_ctrl_del_fh(struct v4l2_ctrl *ctrl, struct v4l2_fh *fh);
+void v4l2_ctrl_add_event(struct v4l2_ctrl *ctrl,
+                struct v4l2_subscribed_event *sev);
+void v4l2_ctrl_del_event(struct v4l2_ctrl *ctrl,
+                struct v4l2_subscribed_event *sev);
 
 /** v4l2_ctrl_subscribe_fh() - Helper function that subscribes a control event.
   * @fh:        The file handler that subscribed the control event.
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);