From 42b4067f60f3f2fe87489fb20414ea46be25f9fb Mon Sep 17 00:00:00 2001
From: Hans Verkuil <hans.verkuil@cisco.com>
Date: Tue, 29 Jan 2013 08:52:19 -0300
Subject: [PATCH] --- yaml --- r: 367011 b: refs/heads/master c:
 91e20e81087c990f3f9c0074ed740e63c666071b h: refs/heads/master i:   367009:
 0a9c78b75a14e4d71407fc19cd3788c59463f0ce   367007:
 b182f3fb7cbca7403a8eb88e9f639c8bf232f06f v: v3

---
 [refs]                                   |  2 +-
 trunk/drivers/media/radio/radio-si4713.c | 32 ------------------------
 2 files changed, 1 insertion(+), 33 deletions(-)

diff --git a/[refs] b/[refs]
index 8fcbbc3d1ef0..38548a374018 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3de09fbbfaa521e68675bd30cfece252c4856600
+refs/heads/master: 91e20e81087c990f3f9c0074ed740e63c666071b
diff --git a/trunk/drivers/media/radio/radio-si4713.c b/trunk/drivers/media/radio/radio-si4713.c
index 38b3f1541c4e..320f3012c850 100644
--- a/trunk/drivers/media/radio/radio-si4713.c
+++ b/trunk/drivers/media/radio/radio-si4713.c
@@ -59,35 +59,6 @@ static const struct v4l2_file_operations radio_si4713_fops = {
 };
 
 /* Video4Linux Interface */
-static int radio_si4713_fill_audout(struct v4l2_audioout *vao)
-{
-	/* TODO: check presence of audio output */
-	strlcpy(vao->name, "FM Modulator Audio Out", 32);
-
-	return 0;
-}
-
-static int radio_si4713_enumaudout(struct file *file, void *priv,
-						struct v4l2_audioout *vao)
-{
-	return radio_si4713_fill_audout(vao);
-}
-
-static int radio_si4713_g_audout(struct file *file, void *priv,
-					struct v4l2_audioout *vao)
-{
-	int rval = radio_si4713_fill_audout(vao);
-
-	vao->index = 0;
-
-	return rval;
-}
-
-static int radio_si4713_s_audout(struct file *file, void *priv,
-					const struct v4l2_audioout *vao)
-{
-	return vao->index ? -EINVAL : 0;
-}
 
 /* radio_si4713_querycap - query device capabilities */
 static int radio_si4713_querycap(struct file *file, void *priv,
@@ -229,9 +200,6 @@ static long radio_si4713_default(struct file *file, void *p,
 }
 
 static struct v4l2_ioctl_ops radio_si4713_ioctl_ops = {
-	.vidioc_enumaudout	= radio_si4713_enumaudout,
-	.vidioc_g_audout	= radio_si4713_g_audout,
-	.vidioc_s_audout	= radio_si4713_s_audout,
 	.vidioc_querycap	= radio_si4713_querycap,
 	.vidioc_queryctrl	= radio_si4713_queryctrl,
 	.vidioc_g_ext_ctrls	= radio_si4713_g_ext_ctrls,