From c3e857ab137390d876dc064ef91d0c4827ec61d7 Mon Sep 17 00:00:00 2001
From: Hans de Goede <hdegoede@redhat.com>
Date: Sun, 8 Apr 2012 12:59:45 -0300
Subject: [PATCH] --- yaml --- r: 306224 b: refs/heads/master c:
 a22d85fea89744fad2cb215da1fe0c1ce226a613 h: refs/heads/master v: v3

---
 [refs]                                  |  2 +-
 trunk/drivers/media/radio/radio-isa.c   | 10 +---------
 trunk/drivers/media/radio/radio-keene.c | 14 +-------------
 3 files changed, 3 insertions(+), 23 deletions(-)

diff --git a/[refs] b/[refs]
index 66899bc14ecc..b99d1c02bb3f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6c493f8b28c6744995e92801a20dca192635dd22
+refs/heads/master: a22d85fea89744fad2cb215da1fe0c1ce226a613
diff --git a/trunk/drivers/media/radio/radio-isa.c b/trunk/drivers/media/radio/radio-isa.c
index c7450fb90d2b..3c0067de4324 100644
--- a/trunk/drivers/media/radio/radio-isa.c
+++ b/trunk/drivers/media/radio/radio-isa.c
@@ -150,14 +150,6 @@ static int radio_isa_log_status(struct file *file, void *priv)
 	return 0;
 }
 
-static int radio_isa_subscribe_event(struct v4l2_fh *fh,
-				struct v4l2_event_subscription *sub)
-{
-	if (sub->type == V4L2_EVENT_CTRL)
-		return v4l2_event_subscribe(fh, sub, 0);
-	return -EINVAL;
-}
-
 static const struct v4l2_ctrl_ops radio_isa_ctrl_ops = {
 	.s_ctrl = radio_isa_s_ctrl,
 };
@@ -177,7 +169,7 @@ static const struct v4l2_ioctl_ops radio_isa_ioctl_ops = {
 	.vidioc_g_frequency = radio_isa_g_frequency,
 	.vidioc_s_frequency = radio_isa_s_frequency,
 	.vidioc_log_status  = radio_isa_log_status,
-	.vidioc_subscribe_event   = radio_isa_subscribe_event,
+	.vidioc_subscribe_event   = v4l2_ctrl_subscribe_event,
 	.vidioc_unsubscribe_event = v4l2_event_unsubscribe,
 };
 
diff --git a/trunk/drivers/media/radio/radio-keene.c b/trunk/drivers/media/radio/radio-keene.c
index 62d32c4946f7..79adf3e654e5 100644
--- a/trunk/drivers/media/radio/radio-keene.c
+++ b/trunk/drivers/media/radio/radio-keene.c
@@ -271,18 +271,6 @@ static int keene_s_ctrl(struct v4l2_ctrl *ctrl)
 	return -EINVAL;
 }
 
-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;
-	}
-}
-
-
 /* File system interface */
 static const struct v4l2_file_operations usb_keene_fops = {
 	.owner		= THIS_MODULE,
@@ -303,7 +291,7 @@ static const struct v4l2_ioctl_ops usb_keene_ioctl_ops = {
 	.vidioc_g_frequency = vidioc_g_frequency,
 	.vidioc_s_frequency = vidioc_s_frequency,
 	.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,
 };