media: ivtv: Drop superfluous ioctl PCM ops

snd_ivtv_pcm_ioctl() does nothing but calling the default handler.
Now PCM core accepts NULL as the default ioctl ops, so let's drop
altogether.

Cc: Andy Walls <awalls@md.metrocast.net>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>

diff --git a/drivers/media/pci/ivtv/ivtv-alsa-pcm.c b/drivers/media/pci/ivtv/ivtv-alsa-pcm.c
index cb281ce089f937dc3d1fd1fe48fcfd4b1667461b..8f346d7da9c8defb12191c3addb12a118547b9a0 100644 (file)
--- a/drivers/media/pci/ivtv/ivtv-alsa-pcm.c
+++ b/drivers/media/pci/ivtv/ivtv-alsa-pcm.c
@@ -204,18 +204,6 @@ static int snd_ivtv_pcm_capture_close(struct snd_pcm_substream *substream)
        return 0;
 }
 
-static int snd_ivtv_pcm_ioctl(struct snd_pcm_substream *substream,
-                    unsigned int cmd, void *arg)
-{
-       struct snd_ivtv_card *itvsc = snd_pcm_substream_chip(substream);
-       int ret;
-
-       snd_ivtv_lock(itvsc);
-       ret = snd_pcm_lib_ioctl(substream, cmd, arg);
-       snd_ivtv_unlock(itvsc);
-       return ret;
-}
-
 static int snd_ivtv_pcm_prepare(struct snd_pcm_substream *substream)
 {
        struct snd_ivtv_card *itvsc = snd_pcm_substream_chip(substream);
@@ -248,7 +236,6 @@ snd_pcm_uframes_t snd_ivtv_pcm_pointer(struct snd_pcm_substream *substream)
 static const struct snd_pcm_ops snd_ivtv_pcm_capture_ops = {
        .open           = snd_ivtv_pcm_capture_open,
        .close          = snd_ivtv_pcm_capture_close,
-       .ioctl          = snd_ivtv_pcm_ioctl,
        .prepare        = snd_ivtv_pcm_prepare,
        .trigger        = snd_ivtv_pcm_trigger,
        .pointer        = snd_ivtv_pcm_pointer,