]> bbs.cooldavid.org Git - net-next-2.6.git/commitdiff
V4L/DVB: gspca - main: Remove useless audio ioctl's
authorJean-François Moine <moinejf@free.fr>
Wed, 14 Jul 2010 09:25:16 +0000 (06:25 -0300)
committerMauro Carvalho Chehab <mchehab@redhat.com>
Mon, 2 Aug 2010 19:43:04 +0000 (16:43 -0300)
Signed-off-by: Jean-François Moine <moinejf@free.fr>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
drivers/media/video/gspca/gspca.c

index af7e042fd19ff144485fee659b9873d8fc625131..98c6bdd14455121d2ddae3752b136ea6f030bf34 100644 (file)
@@ -1396,34 +1396,6 @@ static int vidioc_g_ctrl(struct file *file, void *priv,
        return ret;
 }
 
-/*fixme: have an audio flag in gspca_dev?*/
-static int vidioc_s_audio(struct file *file, void *priv,
-                        struct v4l2_audio *audio)
-{
-       if (audio->index != 0)
-               return -EINVAL;
-       return 0;
-}
-
-static int vidioc_g_audio(struct file *file, void *priv,
-                        struct v4l2_audio *audio)
-{
-       strcpy(audio->name, "Microphone");
-       return 0;
-}
-
-static int vidioc_enumaudio(struct file *file, void *priv,
-                        struct v4l2_audio *audio)
-{
-       if (audio->index != 0)
-               return -EINVAL;
-
-       strcpy(audio->name, "Microphone");
-       audio->capability = 0;
-       audio->mode = 0;
-       return 0;
-}
-
 static int vidioc_querymenu(struct file *file, void *priv,
                            struct v4l2_querymenu *qmenu)
 {
@@ -2112,9 +2084,6 @@ static const struct v4l2_ioctl_ops dev_ioctl_ops = {
        .vidioc_queryctrl       = vidioc_queryctrl,
        .vidioc_g_ctrl          = vidioc_g_ctrl,
        .vidioc_s_ctrl          = vidioc_s_ctrl,
-       .vidioc_g_audio         = vidioc_g_audio,
-       .vidioc_s_audio         = vidioc_s_audio,
-       .vidioc_enumaudio       = vidioc_enumaudio,
        .vidioc_querymenu       = vidioc_querymenu,
        .vidioc_enum_input      = vidioc_enum_input,
        .vidioc_g_input         = vidioc_g_input,