summaryrefslogtreecommitdiffstats
path: root/include/media
diff options
context:
space:
mode:
authorHans de Goede <hdegoede@redhat.com>2012-04-08 12:59:47 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2012-05-07 16:29:35 -0300
commit3e366149b8957f809081e5f0f70d209175127e29 (patch)
tree7ba69744a1bacd7b490d02d02d265e42f4c4e7a9 /include/media
parentc53c2549333b340e2662dc64ec81323476b69a97 (diff)
downloadlinux-3e366149b8957f809081e5f0f70d209175127e29.tar.gz
linux-3e366149b8957f809081e5f0f70d209175127e29.tar.bz2
linux-3e366149b8957f809081e5f0f70d209175127e29.zip
[media] v4l2-ctrls: Use v4l2_subscribed_event_ops
Signed-off-by: Hans de Goede <hdegoede@redhat.com> [hans.verkuil@cisco.com: Fix a locking bug] Acked-by: Hans Verkuil <hans.verkuil@cisco.com> Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'include/media')
-rw-r--r--include/media/v4l2-ctrls.h7
1 files changed, 3 insertions, 4 deletions
diff --git a/include/media/v4l2-ctrls.h b/include/media/v4l2-ctrls.h
index 8920f8210eab..c6f6b4c2c5f2 100644
--- a/include/media/v4l2-ctrls.h
+++ b/include/media/v4l2-ctrls.h
@@ -491,10 +491,9 @@ 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_event(struct v4l2_ctrl *ctrl,
- struct v4l2_subscribed_event *sev);
-void v4l2_ctrl_del_event(struct v4l2_ctrl *ctrl,
- struct v4l2_subscribed_event *sev);
+extern const struct v4l2_subscribed_event_ops v4l2_ctrl_sub_ev_ops;
+void v4l2_ctrl_replace(struct v4l2_event *old, const struct v4l2_event *new);
+void v4l2_ctrl_merge(const struct v4l2_event *old, struct v4l2_event *new);
struct file;
/* Can be used as a vidioc_log_status function that just dumps all controls