From: Hans Verkuil <hverkuil@xs4all.nl>
To: linux-media@vger.kernel.org
Cc: Jiri Kosina <jkosina@suse.cz>,
linux-input@vger.kernel.org,
Hans Verkuil <hans.verkuil@cisco.com>
Subject: [PATCH 4/6] vivi: use v4l2_ctrl_subscribe_event.
Date: Thu, 2 Feb 2012 12:56:34 +0100 [thread overview]
Message-ID: <b6563ffd396902fd91d5fef05093adaf6f28c36c.1328183271.git.hans.verkuil@cisco.com> (raw)
In-Reply-To: <1328183796-3168-1-git-send-email-hverkuil@xs4all.nl>
In-Reply-To: <71ef01f774221fd98c5d3e5a0dc4613dc928d967.1328183271.git.hans.verkuil@cisco.com>
From: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
---
drivers/media/video/vivi.c | 13 +------------
1 files changed, 1 insertions(+), 12 deletions(-)
diff --git a/drivers/media/video/vivi.c b/drivers/media/video/vivi.c
index cef8c91..28d7112 100644
--- a/drivers/media/video/vivi.c
+++ b/drivers/media/video/vivi.c
@@ -1001,17 +1001,6 @@ static int vidioc_s_input(struct file *file, void *priv, unsigned int i)
return 0;
}
-static int vidioc_subscribe_event(struct v4l2_fh *fh,
- struct v4l2_event_subscription *sub)
-{
- switch (sub->type) {
- case V4L2_EVENT_CTRL:
- return v4l2_event_subscribe(fh, sub, 0);
- default:
- return -EINVAL;
- }
-}
-
/* --- controls ---------------------------------------------- */
static int vivi_g_volatile_ctrl(struct v4l2_ctrl *ctrl)
@@ -1203,7 +1192,7 @@ static const struct v4l2_ioctl_ops vivi_ioctl_ops = {
.vidioc_streamon = vidioc_streamon,
.vidioc_streamoff = vidioc_streamoff,
.vidioc_log_status = v4l2_ctrl_log_status,
- .vidioc_subscribe_event = vidioc_subscribe_event,
+ .vidioc_subscribe_event = v4l2_ctrl_subscribe_event,
.vidioc_unsubscribe_event = v4l2_event_unsubscribe,
};
--
1.7.8.3
next prev parent reply other threads:[~2012-02-02 11:56 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-02-02 11:56 [PATCH 0/6] Add support functions and the radio-keene driver Hans Verkuil
2012-02-02 11:56 ` [PATCH 1/6] v4l2: standardize log start/end message Hans Verkuil
2012-02-02 11:56 ` [PATCH 2/6] v4l2-subdev: add start/end messages for log_status Hans Verkuil
2012-02-07 10:49 ` Laurent Pinchart
2012-02-02 11:56 ` [PATCH 3/6] v4l2-ctrls: add helper functions for control events Hans Verkuil
2012-02-02 11:56 ` Hans Verkuil [this message]
2012-02-02 11:56 ` [PATCH 5/6] radio-keene: add a driver for the Keene FM Transmitter Hans Verkuil
2012-02-02 11:56 ` [PATCH 6/6] hid-core: ignore the Keene FM transmitter Hans Verkuil
2012-02-02 12:02 ` Jiri Kosina
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=b6563ffd396902fd91d5fef05093adaf6f28c36c.1328183271.git.hans.verkuil@cisco.com \
--to=hverkuil@xs4all.nl \
--cc=hans.verkuil@cisco.com \
--cc=jkosina@suse.cz \
--cc=linux-input@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).