Commit 3028bc2d authored by Takashi Iwai's avatar Takashi Iwai Committed by Mauro Carvalho Chehab

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: default avatarTakashi Iwai <tiwai@suse.de>
Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+huawei@kernel.org>
parent 86ee7f28
...@@ -204,18 +204,6 @@ static int snd_ivtv_pcm_capture_close(struct snd_pcm_substream *substream) ...@@ -204,18 +204,6 @@ static int snd_ivtv_pcm_capture_close(struct snd_pcm_substream *substream)
return 0; 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) static int snd_ivtv_pcm_prepare(struct snd_pcm_substream *substream)
{ {
struct snd_ivtv_card *itvsc = snd_pcm_substream_chip(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) ...@@ -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 = { static const struct snd_pcm_ops snd_ivtv_pcm_capture_ops = {
.open = snd_ivtv_pcm_capture_open, .open = snd_ivtv_pcm_capture_open,
.close = snd_ivtv_pcm_capture_close, .close = snd_ivtv_pcm_capture_close,
.ioctl = snd_ivtv_pcm_ioctl,
.prepare = snd_ivtv_pcm_prepare, .prepare = snd_ivtv_pcm_prepare,
.trigger = snd_ivtv_pcm_trigger, .trigger = snd_ivtv_pcm_trigger,
.pointer = snd_ivtv_pcm_pointer, .pointer = snd_ivtv_pcm_pointer,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment