aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHans Verkuil <hans.verkuil@cisco.com>2012-09-06 08:23:03 -0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2013-01-04 21:46:50 -0500
commitdd5a4363224614489f6fef25272328ba949a4121 (patch)
treee68418da51efdc07873ac98605eddba6e72b2744
parenta9d79fe581f4019209ddc121b114dc28b88cdab0 (diff)
[media] em28xx: remove bogus input/audio ioctls for the radio device
Radio devices should not implement those ioctls. Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com> Signed-off-by: Devin Heitmueller <dheitmueller@kernellabs.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
-rw-r--r--drivers/media/usb/em28xx/em28xx-video.c35
1 files changed, 0 insertions, 35 deletions
diff --git a/drivers/media/usb/em28xx/em28xx-video.c b/drivers/media/usb/em28xx/em28xx-video.c
index fb9ee4677130..f025440bf953 100644
--- a/drivers/media/usb/em28xx/em28xx-video.c
+++ b/drivers/media/usb/em28xx/em28xx-video.c
@@ -1856,26 +1856,6 @@ static int radio_g_tuner(struct file *file, void *priv,
1856 return 0; 1856 return 0;
1857} 1857}
1858 1858
1859static int radio_enum_input(struct file *file, void *priv,
1860 struct v4l2_input *i)
1861{
1862 if (i->index != 0)
1863 return -EINVAL;
1864 strcpy(i->name, "Radio");
1865 i->type = V4L2_INPUT_TYPE_TUNER;
1866
1867 return 0;
1868}
1869
1870static int radio_g_audio(struct file *file, void *priv, struct v4l2_audio *a)
1871{
1872 if (unlikely(a->index))
1873 return -EINVAL;
1874
1875 strcpy(a->name, "Radio");
1876 return 0;
1877}
1878
1879static int radio_s_tuner(struct file *file, void *priv, 1859static int radio_s_tuner(struct file *file, void *priv,
1880 struct v4l2_tuner *t) 1860 struct v4l2_tuner *t)
1881{ 1861{
@@ -1889,17 +1869,6 @@ static int radio_s_tuner(struct file *file, void *priv,
1889 return 0; 1869 return 0;
1890} 1870}
1891 1871
1892static int radio_s_audio(struct file *file, void *fh,
1893 const struct v4l2_audio *a)
1894{
1895 return 0;
1896}
1897
1898static int radio_s_input(struct file *file, void *fh, unsigned int i)
1899{
1900 return 0;
1901}
1902
1903static int radio_queryctrl(struct file *file, void *priv, 1872static int radio_queryctrl(struct file *file, void *priv,
1904 struct v4l2_queryctrl *qc) 1873 struct v4l2_queryctrl *qc)
1905{ 1874{
@@ -2279,11 +2248,7 @@ static const struct v4l2_file_operations radio_fops = {
2279static const struct v4l2_ioctl_ops radio_ioctl_ops = { 2248static const struct v4l2_ioctl_ops radio_ioctl_ops = {
2280 .vidioc_querycap = vidioc_querycap, 2249 .vidioc_querycap = vidioc_querycap,
2281 .vidioc_g_tuner = radio_g_tuner, 2250 .vidioc_g_tuner = radio_g_tuner,
2282 .vidioc_enum_input = radio_enum_input,
2283 .vidioc_g_audio = radio_g_audio,
2284 .vidioc_s_tuner = radio_s_tuner, 2251 .vidioc_s_tuner = radio_s_tuner,
2285 .vidioc_s_audio = radio_s_audio,
2286 .vidioc_s_input = radio_s_input,
2287 .vidioc_queryctrl = radio_queryctrl, 2252 .vidioc_queryctrl = radio_queryctrl,
2288 .vidioc_g_ctrl = vidioc_g_ctrl, 2253 .vidioc_g_ctrl = vidioc_g_ctrl,
2289 .vidioc_s_ctrl = vidioc_s_ctrl, 2254 .vidioc_s_ctrl = vidioc_s_ctrl,