aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/radio/radio-isa.c
diff options
context:
space:
mode:
authorHans de Goede <hdegoede@redhat.com>2012-04-08 11:59:45 -0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2012-05-07 15:26:32 -0400
commita22d85fea89744fad2cb215da1fe0c1ce226a613 (patch)
tree2506940fd4b9d294d3c07c03144e766a14d0107b /drivers/media/radio/radio-isa.c
parent6c493f8b28c6744995e92801a20dca192635dd22 (diff)
[media] media/radio: use v4l2_ctrl_subscribe_event where possible
Signed-off-by: Hans de Goede <hdegoede@redhat.com> Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/radio/radio-isa.c')
-rw-r--r--drivers/media/radio/radio-isa.c10
1 files changed, 1 insertions, 9 deletions
diff --git a/drivers/media/radio/radio-isa.c b/drivers/media/radio/radio-isa.c
index c7450fb90d2b..3c0067de4324 100644
--- a/drivers/media/radio/radio-isa.c
+++ b/drivers/media/radio/radio-isa.c
@@ -150,14 +150,6 @@ static int radio_isa_log_status(struct file *file, void *priv)
150 return 0; 150 return 0;
151} 151}
152 152
153static int radio_isa_subscribe_event(struct v4l2_fh *fh,
154 struct v4l2_event_subscription *sub)
155{
156 if (sub->type == V4L2_EVENT_CTRL)
157 return v4l2_event_subscribe(fh, sub, 0);
158 return -EINVAL;
159}
160
161static const struct v4l2_ctrl_ops radio_isa_ctrl_ops = { 153static const struct v4l2_ctrl_ops radio_isa_ctrl_ops = {
162 .s_ctrl = radio_isa_s_ctrl, 154 .s_ctrl = radio_isa_s_ctrl,
163}; 155};
@@ -177,7 +169,7 @@ static const struct v4l2_ioctl_ops radio_isa_ioctl_ops = {
177 .vidioc_g_frequency = radio_isa_g_frequency, 169 .vidioc_g_frequency = radio_isa_g_frequency,
178 .vidioc_s_frequency = radio_isa_s_frequency, 170 .vidioc_s_frequency = radio_isa_s_frequency,
179 .vidioc_log_status = radio_isa_log_status, 171 .vidioc_log_status = radio_isa_log_status,
180 .vidioc_subscribe_event = radio_isa_subscribe_event, 172 .vidioc_subscribe_event = v4l2_ctrl_subscribe_event,
181 .vidioc_unsubscribe_event = v4l2_event_unsubscribe, 173 .vidioc_unsubscribe_event = v4l2_event_unsubscribe,
182}; 174};
183 175