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

ALSA: isa: 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-8-tiwai@suse.de


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

sound/isa/ad1816a/ad1816a_lib.c

+0 −2
Original line number Diff line number Diff line
@@ -633,7 +633,6 @@ int snd_ad1816a_create(struct snd_card *card, 
static const struct snd_pcm_ops snd_ad1816a_playback_ops = {

	.open =		snd_ad1816a_playback_open,

	.close =	snd_ad1816a_playback_close,

	.ioctl =	snd_pcm_lib_ioctl,

	.prepare =	snd_ad1816a_playback_prepare,

	.trigger =	snd_ad1816a_playback_trigger,

	.pointer =	snd_ad1816a_playback_pointer,
@@ -642,7 +641,6 @@ static const struct snd_pcm_ops snd_ad1816a_playback_ops = { 
static const struct snd_pcm_ops snd_ad1816a_capture_ops = {

	.open =		snd_ad1816a_capture_open,

	.close =	snd_ad1816a_capture_close,

	.ioctl =	snd_pcm_lib_ioctl,

	.prepare =	snd_ad1816a_capture_prepare,

	.trigger =	snd_ad1816a_capture_trigger,

	.pointer =	snd_ad1816a_capture_pointer,

sound/isa/es18xx.c

+0 −2
Original line number Diff line number Diff line
@@ -1643,7 +1643,6 @@ static int snd_es18xx_probe(struct snd_es18xx *chip, 
static const struct snd_pcm_ops snd_es18xx_playback_ops = {

	.open =		snd_es18xx_playback_open,

	.close =	snd_es18xx_playback_close,

	.ioctl =	snd_pcm_lib_ioctl,

	.hw_params =	snd_es18xx_playback_hw_params,

	.prepare =	snd_es18xx_playback_prepare,

	.trigger =	snd_es18xx_playback_trigger,
@@ -1653,7 +1652,6 @@ static const struct snd_pcm_ops snd_es18xx_playback_ops = { 
static const struct snd_pcm_ops snd_es18xx_capture_ops = {

	.open =		snd_es18xx_capture_open,

	.close =	snd_es18xx_capture_close,

	.ioctl =	snd_pcm_lib_ioctl,

	.hw_params =	snd_es18xx_capture_hw_params,

	.prepare =	snd_es18xx_capture_prepare,

	.trigger =	snd_es18xx_capture_trigger,

sound/isa/gus/gus_pcm.c

+0 −2
Original line number Diff line number Diff line
@@ -821,7 +821,6 @@ static const struct snd_kcontrol_new snd_gf1_pcm_volume_control1 = 
static const struct snd_pcm_ops snd_gf1_pcm_playback_ops = {

	.open =		snd_gf1_pcm_playback_open,

	.close =	snd_gf1_pcm_playback_close,

	.ioctl =	snd_pcm_lib_ioctl,

	.hw_params =	snd_gf1_pcm_playback_hw_params,

	.hw_free =	snd_gf1_pcm_playback_hw_free,

	.prepare =	snd_gf1_pcm_playback_prepare,
@@ -835,7 +834,6 @@ static const struct snd_pcm_ops snd_gf1_pcm_playback_ops = { 
static const struct snd_pcm_ops snd_gf1_pcm_capture_ops = {

	.open =		snd_gf1_pcm_capture_open,

	.close =	snd_gf1_pcm_capture_close,

	.ioctl =	snd_pcm_lib_ioctl,

	.hw_params =	snd_gf1_pcm_capture_hw_params,

	.prepare =	snd_gf1_pcm_capture_prepare,

	.trigger =	snd_gf1_pcm_capture_trigger,

sound/isa/msnd/msnd.c

+0 −2
Original line number Diff line number Diff line
@@ -562,7 +562,6 @@ snd_msnd_playback_pointer(struct snd_pcm_substream *substream) 
static const struct snd_pcm_ops snd_msnd_playback_ops = {

	.open =		snd_msnd_playback_open,

	.close =	snd_msnd_playback_close,

	.ioctl =	snd_pcm_lib_ioctl,

	.hw_params =	snd_msnd_playback_hw_params,

	.prepare =	snd_msnd_playback_prepare,

	.trigger =	snd_msnd_playback_trigger,
@@ -659,7 +658,6 @@ static int snd_msnd_capture_hw_params(struct snd_pcm_substream *substream, 
static const struct snd_pcm_ops snd_msnd_capture_ops = {

	.open =		snd_msnd_capture_open,

	.close =	snd_msnd_capture_close,

	.ioctl =	snd_pcm_lib_ioctl,

	.hw_params =	snd_msnd_capture_hw_params,

	.prepare =	snd_msnd_capture_prepare,

	.trigger =	snd_msnd_capture_trigger,

sound/isa/sb/emu8000_pcm.c

+0 −1
Original line number Diff line number Diff line
@@ -660,7 +660,6 @@ static snd_pcm_uframes_t emu8k_pcm_pointer(struct snd_pcm_substream *subs) 
static const struct snd_pcm_ops emu8k_pcm_ops = {

	.open =		emu8k_pcm_open,

	.close =	emu8k_pcm_close,

	.ioctl =	snd_pcm_lib_ioctl,

	.hw_params =	emu8k_pcm_hw_params,

	.hw_free =	emu8k_pcm_hw_free,

	.prepare =	emu8k_pcm_prepare,

CRA Git | Maintained and supported by SUSTech CRA and CCSE