diff options
| author | Hans Verkuil <hans.verkuil@cisco.com> | 2013-01-29 06:52:19 -0500 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2013-04-14 18:48:52 -0400 |
| commit | 91e20e81087c990f3f9c0074ed740e63c666071b (patch) | |
| tree | 9a10d2f0c80792e6b065e943b0eb93ef28d0ea78 | |
| parent | 3de09fbbfaa521e68675bd30cfece252c4856600 (diff) | |
[media] radio-si4713: remove audout ioctls
The audout ioctls are not appropriate for radio transmitters, they apply to
video output devices only. Remove them from this driver.
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Acked-by: Eduardo Valentin <edubezval@gmail.com>
Tested-by: Eduardo Valentin <edubezval@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
| -rw-r--r-- | drivers/media/radio/radio-si4713.c | 32 |
1 files changed, 0 insertions, 32 deletions
diff --git a/drivers/media/radio/radio-si4713.c b/drivers/media/radio/radio-si4713.c index 38b3f1541c4e..320f3012c850 100644 --- a/drivers/media/radio/radio-si4713.c +++ b/drivers/media/radio/radio-si4713.c | |||
| @@ -59,35 +59,6 @@ static const struct v4l2_file_operations radio_si4713_fops = { | |||
| 59 | }; | 59 | }; |
| 60 | 60 | ||
| 61 | /* Video4Linux Interface */ | 61 | /* Video4Linux Interface */ |
| 62 | static int radio_si4713_fill_audout(struct v4l2_audioout *vao) | ||
| 63 | { | ||
| 64 | /* TODO: check presence of audio output */ | ||
| 65 | strlcpy(vao->name, "FM Modulator Audio Out", 32); | ||
| 66 | |||
| 67 | return 0; | ||
| 68 | } | ||
| 69 | |||
| 70 | static int radio_si4713_enumaudout(struct file *file, void *priv, | ||
| 71 | struct v4l2_audioout *vao) | ||
| 72 | { | ||
| 73 | return radio_si4713_fill_audout(vao); | ||
| 74 | } | ||
| 75 | |||
| 76 | static int radio_si4713_g_audout(struct file *file, void *priv, | ||
| 77 | struct v4l2_audioout *vao) | ||
| 78 | { | ||
| 79 | int rval = radio_si4713_fill_audout(vao); | ||
| 80 | |||
| 81 | vao->index = 0; | ||
| 82 | |||
| 83 | return rval; | ||
| 84 | } | ||
| 85 | |||
| 86 | static int radio_si4713_s_audout(struct file *file, void *priv, | ||
| 87 | const struct v4l2_audioout *vao) | ||
| 88 | { | ||
| 89 | return vao->index ? -EINVAL : 0; | ||
| 90 | } | ||
| 91 | 62 | ||
| 92 | /* radio_si4713_querycap - query device capabilities */ | 63 | /* radio_si4713_querycap - query device capabilities */ |
| 93 | static int radio_si4713_querycap(struct file *file, void *priv, | 64 | static int radio_si4713_querycap(struct file *file, void *priv, |
| @@ -229,9 +200,6 @@ static long radio_si4713_default(struct file *file, void *p, | |||
| 229 | } | 200 | } |
| 230 | 201 | ||
| 231 | static struct v4l2_ioctl_ops radio_si4713_ioctl_ops = { | 202 | static struct v4l2_ioctl_ops radio_si4713_ioctl_ops = { |
| 232 | .vidioc_enumaudout = radio_si4713_enumaudout, | ||
| 233 | .vidioc_g_audout = radio_si4713_g_audout, | ||
| 234 | .vidioc_s_audout = radio_si4713_s_audout, | ||
| 235 | .vidioc_querycap = radio_si4713_querycap, | 203 | .vidioc_querycap = radio_si4713_querycap, |
| 236 | .vidioc_queryctrl = radio_si4713_queryctrl, | 204 | .vidioc_queryctrl = radio_si4713_queryctrl, |
| 237 | .vidioc_g_ext_ctrls = radio_si4713_g_ext_ctrls, | 205 | .vidioc_g_ext_ctrls = radio_si4713_g_ext_ctrls, |