Commit ae531486 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

ALSA: drivers: Drop superfluous ioctl PCM ops 

PCM core deals the empty ioctl field now as default(*).
Let's kill the redundant lines.

(*) commit fc033cbf ("ALSA: pcm: Allow NULL ioctl ops")

Link: https://lore.kernel.org/r/20191210061145.24641-5-tiwai@suse.de


Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 1eb1a950

sound/drivers/aloop.c

+0 −1
Original line number Diff line number Diff line
@@ -1299,7 +1299,6 @@ static int loopback_close(struct snd_pcm_substream *substream) 
static const struct snd_pcm_ops loopback_pcm_ops = {

	.open =		loopback_open,

	.close =	loopback_close,

	.ioctl =	snd_pcm_lib_ioctl,

	.hw_free =	loopback_hw_free,

	.prepare =	loopback_prepare,

	.trigger =	loopback_trigger,

sound/drivers/dummy.c

+0 −2
Original line number Diff line number Diff line
@@ -647,7 +647,6 @@ static struct page *dummy_pcm_page(struct snd_pcm_substream *substream, 
static struct snd_pcm_ops dummy_pcm_ops = {

	.open =		dummy_pcm_open,

	.close =	dummy_pcm_close,

	.ioctl =	snd_pcm_lib_ioctl,

	.hw_params =	dummy_pcm_hw_params,

	.prepare =	dummy_pcm_prepare,

	.trigger =	dummy_pcm_trigger,
@@ -657,7 +656,6 @@ static struct snd_pcm_ops dummy_pcm_ops = { 
static struct snd_pcm_ops dummy_pcm_ops_no_buf = {

	.open =		dummy_pcm_open,

	.close =	dummy_pcm_close,

	.ioctl =	snd_pcm_lib_ioctl,

	.hw_params =	dummy_pcm_hw_params,

	.prepare =	dummy_pcm_prepare,

	.trigger =	dummy_pcm_trigger,

sound/drivers/ml403-ac97cr.c

+0 −2
Original line number Diff line number Diff line
@@ -731,7 +731,6 @@ static int snd_ml403_ac97cr_capture_close(struct snd_pcm_substream *substream) 
static const struct snd_pcm_ops snd_ml403_ac97cr_playback_ops = {

	.open = snd_ml403_ac97cr_playback_open,

	.close = snd_ml403_ac97cr_playback_close,

	.ioctl = snd_pcm_lib_ioctl,

	.prepare = snd_ml403_ac97cr_pcm_playback_prepare,

	.trigger = snd_ml403_ac97cr_pcm_playback_trigger,

	.pointer = snd_ml403_ac97cr_pcm_pointer,
@@ -740,7 +739,6 @@ static const struct snd_pcm_ops snd_ml403_ac97cr_playback_ops = { 
static const struct snd_pcm_ops snd_ml403_ac97cr_capture_ops = {

	.open = snd_ml403_ac97cr_capture_open,

	.close = snd_ml403_ac97cr_capture_close,

	.ioctl = snd_pcm_lib_ioctl,

	.prepare = snd_ml403_ac97cr_pcm_capture_prepare,

	.trigger = snd_ml403_ac97cr_pcm_capture_trigger,

	.pointer = snd_ml403_ac97cr_pcm_pointer,

sound/drivers/pcsp/pcsp_lib.c

+0 −1
Original line number Diff line number Diff line
@@ -322,7 +322,6 @@ static int snd_pcsp_playback_open(struct snd_pcm_substream *substream) 
static const struct snd_pcm_ops snd_pcsp_playback_ops = {

	.open = snd_pcsp_playback_open,

	.close = snd_pcsp_playback_close,

	.ioctl = snd_pcm_lib_ioctl,

	.hw_params = snd_pcsp_playback_hw_params,

	.hw_free = snd_pcsp_playback_hw_free,

	.prepare = snd_pcsp_playback_prepare,

sound/drivers/vx/vx_pcm.c

+0 −2
Original line number Diff line number Diff line
@@ -843,7 +843,6 @@ static int vx_pcm_prepare(struct snd_pcm_substream *subs) 
static const struct snd_pcm_ops vx_pcm_playback_ops = {

	.open =		vx_pcm_playback_open,

	.close =	vx_pcm_playback_close,

	.ioctl =	snd_pcm_lib_ioctl,

	.prepare =	vx_pcm_prepare,

	.trigger =	vx_pcm_trigger,

	.pointer =	vx_pcm_playback_pointer,
@@ -1061,7 +1060,6 @@ static snd_pcm_uframes_t vx_pcm_capture_pointer(struct snd_pcm_substream *subs) 
static const struct snd_pcm_ops vx_pcm_capture_ops = {

	.open =		vx_pcm_capture_open,

	.close =	vx_pcm_capture_close,

	.ioctl =	snd_pcm_lib_ioctl,

	.prepare =	vx_pcm_prepare,

	.trigger =	vx_pcm_trigger,

	.pointer =	vx_pcm_capture_pointer,

CRA Git | Maintained and supported by SUSTech CRA and CCSE