Commit 6fe35086 authored by Takashi Iwai's avatar Takashi Iwai Committed by Mauro Carvalho Chehab
Browse files

media: cobalt: Drop superfluous ioctl PCM ops 



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

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 f8239b53

drivers/media/pci/cobalt/cobalt-alsa-pcm.c

+0 −8
Original line number Diff line number Diff line
@@ -237,12 +237,6 @@ static int snd_cobalt_pcm_capture_close(struct snd_pcm_substream *substream) 
	return 0;

}



static int snd_cobalt_pcm_ioctl(struct snd_pcm_substream *substream,

		     unsigned int cmd, void *arg)

{

	return snd_pcm_lib_ioctl(substream, cmd, arg);

}



static int snd_cobalt_pcm_prepare(struct snd_pcm_substream *substream)

{

	struct snd_cobalt_card *cobsc = snd_pcm_substream_chip(substream);
@@ -450,7 +444,6 @@ snd_pcm_uframes_t snd_cobalt_pcm_pb_pointer(struct snd_pcm_substream *substream) 
static const struct snd_pcm_ops snd_cobalt_pcm_capture_ops = {

	.open		= snd_cobalt_pcm_capture_open,

	.close		= snd_cobalt_pcm_capture_close,

	.ioctl		= snd_cobalt_pcm_ioctl,

	.prepare	= snd_cobalt_pcm_prepare,

	.trigger	= snd_cobalt_pcm_trigger,

	.pointer	= snd_cobalt_pcm_pointer,
@@ -459,7 +452,6 @@ static const struct snd_pcm_ops snd_cobalt_pcm_capture_ops = { 
static const struct snd_pcm_ops snd_cobalt_pcm_playback_ops = {

	.open		= snd_cobalt_pcm_playback_open,

	.close		= snd_cobalt_pcm_playback_close,

	.ioctl		= snd_cobalt_pcm_ioctl,

	.prepare	= snd_cobalt_pcm_pb_prepare,

	.trigger	= snd_cobalt_pcm_pb_trigger,

	.pointer	= snd_cobalt_pcm_pb_pointer,

CRA Git | Maintained and supported by SUSTech CRA and CCSE