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

ALSA: pci: 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-16-tiwai@suse.de


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

sound/pci/ad1889.c

+0 −2
Original line number Diff line number Diff line
@@ -548,7 +548,6 @@ snd_ad1889_capture_pointer(struct snd_pcm_substream *ss) 
static const struct snd_pcm_ops snd_ad1889_playback_ops = {

	.open = snd_ad1889_playback_open,

	.close = snd_ad1889_playback_close,

	.ioctl = snd_pcm_lib_ioctl,

	.prepare = snd_ad1889_playback_prepare,

	.trigger = snd_ad1889_playback_trigger,

	.pointer = snd_ad1889_playback_pointer,
@@ -557,7 +556,6 @@ static const struct snd_pcm_ops snd_ad1889_playback_ops = { 
static const struct snd_pcm_ops snd_ad1889_capture_ops = {

	.open = snd_ad1889_capture_open,

	.close = snd_ad1889_capture_close,

	.ioctl = snd_pcm_lib_ioctl,

	.prepare = snd_ad1889_capture_prepare,

	.trigger = snd_ad1889_capture_trigger,

	.pointer = snd_ad1889_capture_pointer,

sound/pci/ali5451/ali5451.c

+0 −4
Original line number Diff line number Diff line
@@ -1507,7 +1507,6 @@ static int snd_ali_close(struct snd_pcm_substream *substream) 
static const struct snd_pcm_ops snd_ali_playback_ops = {

	.open =		snd_ali_playback_open,

	.close =	snd_ali_playback_close,

	.ioctl =	snd_pcm_lib_ioctl,

	.hw_params =	snd_ali_playback_hw_params,

	.hw_free =	snd_ali_playback_hw_free,

	.prepare =	snd_ali_playback_prepare,
@@ -1518,7 +1517,6 @@ static const struct snd_pcm_ops snd_ali_playback_ops = { 
static const struct snd_pcm_ops snd_ali_capture_ops = {

	.open =		snd_ali_capture_open,

	.close =	snd_ali_close,

	.ioctl =	snd_pcm_lib_ioctl,

	.prepare =	snd_ali_prepare,

	.trigger =	snd_ali_trigger,

	.pointer =	snd_ali_pointer,
@@ -1591,7 +1589,6 @@ static int snd_ali_modem_capture_open(struct snd_pcm_substream *substream) 
static const struct snd_pcm_ops snd_ali_modem_playback_ops = {

	.open =		snd_ali_modem_playback_open,

	.close =	snd_ali_close,

	.ioctl =	snd_pcm_lib_ioctl,

	.hw_params =	snd_ali_modem_hw_params,

	.prepare =	snd_ali_prepare,

	.trigger =	snd_ali_trigger,
@@ -1601,7 +1598,6 @@ static const struct snd_pcm_ops snd_ali_modem_playback_ops = { 
static const struct snd_pcm_ops snd_ali_modem_capture_ops = {

	.open =		snd_ali_modem_capture_open,

	.close =	snd_ali_close,

	.ioctl =	snd_pcm_lib_ioctl,

	.hw_params =	snd_ali_modem_hw_params,

	.prepare =	snd_ali_prepare,

	.trigger =	snd_ali_trigger,

sound/pci/als300.c

+0 −2
Original line number Diff line number Diff line
@@ -539,7 +539,6 @@ static snd_pcm_uframes_t snd_als300_pointer(struct snd_pcm_substream *substream) 
static const struct snd_pcm_ops snd_als300_playback_ops = {

	.open =		snd_als300_playback_open,

	.close =	snd_als300_playback_close,

	.ioctl =	snd_pcm_lib_ioctl,

	.prepare =	snd_als300_playback_prepare,

	.trigger =	snd_als300_trigger,

	.pointer =	snd_als300_pointer,
@@ -548,7 +547,6 @@ static const struct snd_pcm_ops snd_als300_playback_ops = { 
static const struct snd_pcm_ops snd_als300_capture_ops = {

	.open =		snd_als300_capture_open,

	.close =	snd_als300_capture_close,

	.ioctl =	snd_pcm_lib_ioctl,

	.prepare =	snd_als300_capture_prepare,

	.trigger =	snd_als300_trigger,

	.pointer =	snd_als300_pointer,

sound/pci/als4000.c

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

	.open =		snd_als4000_playback_open,

	.close =	snd_als4000_playback_close,

	.ioctl =	snd_pcm_lib_ioctl,

	.prepare =	snd_als4000_playback_prepare,

	.trigger =	snd_als4000_playback_trigger,

	.pointer =	snd_als4000_playback_pointer
@@ -656,7 +655,6 @@ static const struct snd_pcm_ops snd_als4000_playback_ops = { 
static const struct snd_pcm_ops snd_als4000_capture_ops = {

	.open =		snd_als4000_capture_open,

	.close =	snd_als4000_capture_close,

	.ioctl =	snd_pcm_lib_ioctl,

	.prepare =	snd_als4000_capture_prepare,

	.trigger =	snd_als4000_capture_trigger,

	.pointer =	snd_als4000_capture_pointer

sound/pci/au88x0/au88x0_pcm.c

+0 −1
Original line number Diff line number Diff line
@@ -422,7 +422,6 @@ static snd_pcm_uframes_t snd_vortex_pcm_pointer(struct snd_pcm_substream *substr 
static const struct snd_pcm_ops snd_vortex_playback_ops = {

	.open = snd_vortex_pcm_open,

	.close = snd_vortex_pcm_close,

	.ioctl = snd_pcm_lib_ioctl,

	.hw_params = snd_vortex_pcm_hw_params,

	.hw_free = snd_vortex_pcm_hw_free,

	.prepare = snd_vortex_pcm_prepare,

CRA Git | Maintained and supported by SUSTech CRA and CCSE