aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media
diff options
context:
space:
mode:
authorJean-François Moine <moinejf@free.fr>2010-07-14 05:25:16 -0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2010-08-02 15:43:04 -0400
commita4f96eb2b1d3e0013da7b82b3d3ccd361c3b46b9 (patch)
treeaaef5539430f6b60961b70b4afa50a0d335108bc /drivers/media
parenta2ba6f27cd2c66ad1119e0354a828a1be715c2f1 (diff)
V4L/DVB: gspca - main: Remove useless audio ioctl's
Signed-off-by: Jean-François Moine <moinejf@free.fr> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media')
-rw-r--r--drivers/media/video/gspca/gspca.c31
1 files changed, 0 insertions, 31 deletions
diff --git a/drivers/media/video/gspca/gspca.c b/drivers/media/video/gspca/gspca.c
index af7e042fd19f..98c6bdd14455 100644
--- a/drivers/media/video/gspca/gspca.c
+++ b/drivers/media/video/gspca/gspca.c
@@ -1396,34 +1396,6 @@ static int vidioc_g_ctrl(struct file *file, void *priv,
1396 return ret; 1396 return ret;
1397} 1397}
1398 1398
1399/*fixme: have an audio flag in gspca_dev?*/
1400static int vidioc_s_audio(struct file *file, void *priv,
1401 struct v4l2_audio *audio)
1402{
1403 if (audio->index != 0)
1404 return -EINVAL;
1405 return 0;
1406}
1407
1408static int vidioc_g_audio(struct file *file, void *priv,
1409 struct v4l2_audio *audio)
1410{
1411 strcpy(audio->name, "Microphone");
1412 return 0;
1413}
1414
1415static int vidioc_enumaudio(struct file *file, void *priv,
1416 struct v4l2_audio *audio)
1417{
1418 if (audio->index != 0)
1419 return -EINVAL;
1420
1421 strcpy(audio->name, "Microphone");
1422 audio->capability = 0;
1423 audio->mode = 0;
1424 return 0;
1425}
1426
1427static int vidioc_querymenu(struct file *file, void *priv, 1399static int vidioc_querymenu(struct file *file, void *priv,
1428 struct v4l2_querymenu *qmenu) 1400 struct v4l2_querymenu *qmenu)
1429{ 1401{
@@ -2112,9 +2084,6 @@ static const struct v4l2_ioctl_ops dev_ioctl_ops = {
2112 .vidioc_queryctrl = vidioc_queryctrl, 2084 .vidioc_queryctrl = vidioc_queryctrl,
2113 .vidioc_g_ctrl = vidioc_g_ctrl, 2085 .vidioc_g_ctrl = vidioc_g_ctrl,
2114 .vidioc_s_ctrl = vidioc_s_ctrl, 2086 .vidioc_s_ctrl = vidioc_s_ctrl,
2115 .vidioc_g_audio = vidioc_g_audio,
2116 .vidioc_s_audio = vidioc_s_audio,
2117 .vidioc_enumaudio = vidioc_enumaudio,
2118 .vidioc_querymenu = vidioc_querymenu, 2087 .vidioc_querymenu = vidioc_querymenu,
2119 .vidioc_enum_input = vidioc_enum_input, 2088 .vidioc_enum_input = vidioc_enum_input,
2120 .vidioc_g_input = vidioc_g_input, 2089 .vidioc_g_input = vidioc_g_input,