diff options
author | Hans Verkuil <hans.verkuil@cisco.com> | 2012-09-04 10:46:09 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2012-09-26 09:48:52 -0400 |
commit | 85f5fe3962ca6780e5368feffe32f3b15e953e1f (patch) | |
tree | e3a5441ee86e62d3ca8423308f32c7a32ae68677 /drivers/media/v4l2-core | |
parent | ec6f4328108f1c83d5ac907c0d978fa886ef9627 (diff) |
[media] v4l2: make vidioc_(un)subscribe_event const
Write-only ioctls should have a const argument in the ioctl op.
Do this conversion for vidioc_(un)subscribe_event.
Adding const for write-only ioctls was decided during the 2012 Media Workshop.
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/v4l2-core')
-rw-r--r-- | drivers/media/v4l2-core/v4l2-ctrls.c | 2 | ||||
-rw-r--r-- | drivers/media/v4l2-core/v4l2-event.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/media/v4l2-core/v4l2-ctrls.c b/drivers/media/v4l2-core/v4l2-ctrls.c index ab287f236801..f40003550b60 100644 --- a/drivers/media/v4l2-core/v4l2-ctrls.c +++ b/drivers/media/v4l2-core/v4l2-ctrls.c | |||
@@ -2699,7 +2699,7 @@ int v4l2_ctrl_log_status(struct file *file, void *fh) | |||
2699 | EXPORT_SYMBOL(v4l2_ctrl_log_status); | 2699 | EXPORT_SYMBOL(v4l2_ctrl_log_status); |
2700 | 2700 | ||
2701 | int v4l2_ctrl_subscribe_event(struct v4l2_fh *fh, | 2701 | int v4l2_ctrl_subscribe_event(struct v4l2_fh *fh, |
2702 | struct v4l2_event_subscription *sub) | 2702 | const struct v4l2_event_subscription *sub) |
2703 | { | 2703 | { |
2704 | if (sub->type == V4L2_EVENT_CTRL) | 2704 | if (sub->type == V4L2_EVENT_CTRL) |
2705 | return v4l2_event_subscribe(fh, sub, 0, &v4l2_ctrl_sub_ev_ops); | 2705 | return v4l2_event_subscribe(fh, sub, 0, &v4l2_ctrl_sub_ev_ops); |
diff --git a/drivers/media/v4l2-core/v4l2-event.c b/drivers/media/v4l2-core/v4l2-event.c index ef2a33c94045..18a040b935a3 100644 --- a/drivers/media/v4l2-core/v4l2-event.c +++ b/drivers/media/v4l2-core/v4l2-event.c | |||
@@ -203,7 +203,7 @@ int v4l2_event_pending(struct v4l2_fh *fh) | |||
203 | EXPORT_SYMBOL_GPL(v4l2_event_pending); | 203 | EXPORT_SYMBOL_GPL(v4l2_event_pending); |
204 | 204 | ||
205 | int v4l2_event_subscribe(struct v4l2_fh *fh, | 205 | int v4l2_event_subscribe(struct v4l2_fh *fh, |
206 | struct v4l2_event_subscription *sub, unsigned elems, | 206 | const struct v4l2_event_subscription *sub, unsigned elems, |
207 | const struct v4l2_subscribed_event_ops *ops) | 207 | const struct v4l2_subscribed_event_ops *ops) |
208 | { | 208 | { |
209 | struct v4l2_subscribed_event *sev, *found_ev; | 209 | struct v4l2_subscribed_event *sev, *found_ev; |
@@ -278,7 +278,7 @@ void v4l2_event_unsubscribe_all(struct v4l2_fh *fh) | |||
278 | EXPORT_SYMBOL_GPL(v4l2_event_unsubscribe_all); | 278 | EXPORT_SYMBOL_GPL(v4l2_event_unsubscribe_all); |
279 | 279 | ||
280 | int v4l2_event_unsubscribe(struct v4l2_fh *fh, | 280 | int v4l2_event_unsubscribe(struct v4l2_fh *fh, |
281 | struct v4l2_event_subscription *sub) | 281 | const struct v4l2_event_subscription *sub) |
282 | { | 282 | { |
283 | struct v4l2_subscribed_event *sev; | 283 | struct v4l2_subscribed_event *sev; |
284 | unsigned long flags; | 284 | unsigned long flags; |