Commit 16ccca11 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

ALSA: pci: Drop superfluous snd_pcm_sgbuf_ops_page 

snd_pcm_sgbuf_ops_page is no longer needed to be set explicitly to PCM
page ops since the recent change in the PCM core (*).  Leaving it NULL
should work as long as the preallocation has been done properly.

This patch drops the redundant lines.

(*) 7e8edae3: ALSA: pcm: Handle special page mapping in the
                  default mmap handler

Link: https://lore.kernel.org/r/20191105151856.10785-19-tiwai@suse.de


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

sound/pci/au88x0/au88x0_pcm.c

+0 −1
Original line number Diff line number Diff line
@@ -436,7 +436,6 @@ static const struct snd_pcm_ops snd_vortex_playback_ops = { 
	.prepare = snd_vortex_pcm_prepare,

	.trigger = snd_vortex_pcm_trigger,

	.pointer = snd_vortex_pcm_pointer,

	.page = snd_pcm_sgbuf_ops_page,

};



/*

sound/pci/bt87x.c

+0 −1
Original line number Diff line number Diff line
@@ -545,7 +545,6 @@ static const struct snd_pcm_ops snd_bt87x_pcm_ops = { 
	.prepare = snd_bt87x_prepare,

	.trigger = snd_bt87x_trigger,

	.pointer = snd_bt87x_pointer,

	.page = snd_pcm_sgbuf_ops_page,

};



static int snd_bt87x_capture_volume_info(struct snd_kcontrol *kcontrol,

sound/pci/ctxfi/ctpcm.c

+0 −2
Original line number Diff line number Diff line
@@ -379,7 +379,6 @@ static const struct snd_pcm_ops ct_pcm_playback_ops = { 
	.prepare	= ct_pcm_playback_prepare,

	.trigger	= ct_pcm_playback_trigger,

	.pointer	= ct_pcm_playback_pointer,

	.page		= snd_pcm_sgbuf_ops_page,

};



/* PCM operators for capture */
@@ -392,7 +391,6 @@ static const struct snd_pcm_ops ct_pcm_capture_ops = { 
	.prepare	= ct_pcm_capture_prepare,

	.trigger	= ct_pcm_capture_trigger,

	.pointer	= ct_pcm_capture_pointer,

	.page		= snd_pcm_sgbuf_ops_page,

};



static const struct snd_pcm_chmap_elem surround_map[] = {

sound/pci/echoaudio/echoaudio.c

+0 −4
Original line number Diff line number Diff line
@@ -824,7 +824,6 @@ static const struct snd_pcm_ops analog_playback_ops = { 
	.prepare = pcm_prepare,

	.trigger = pcm_trigger,

	.pointer = pcm_pointer,

	.page = snd_pcm_sgbuf_ops_page,

};

static const struct snd_pcm_ops analog_capture_ops = {

	.open = pcm_analog_in_open,
@@ -835,7 +834,6 @@ static const struct snd_pcm_ops analog_capture_ops = { 
	.prepare = pcm_prepare,

	.trigger = pcm_trigger,

	.pointer = pcm_pointer,

	.page = snd_pcm_sgbuf_ops_page,

};

#ifdef ECHOCARD_HAS_DIGITAL_IO

#ifndef ECHOCARD_HAS_VMIXER
@@ -848,7 +846,6 @@ static const struct snd_pcm_ops digital_playback_ops = { 
	.prepare = pcm_prepare,

	.trigger = pcm_trigger,

	.pointer = pcm_pointer,

	.page = snd_pcm_sgbuf_ops_page,

};

#endif /* !ECHOCARD_HAS_VMIXER */

static const struct snd_pcm_ops digital_capture_ops = {
@@ -860,7 +857,6 @@ static const struct snd_pcm_ops digital_capture_ops = { 
	.prepare = pcm_prepare,

	.trigger = pcm_trigger,

	.pointer = pcm_pointer,

	.page = snd_pcm_sgbuf_ops_page,

};

#endif /* ECHOCARD_HAS_DIGITAL_IO */

sound/pci/emu10k1/emupcm.c

+0 −2
Original line number Diff line number Diff line
@@ -1366,7 +1366,6 @@ static const struct snd_pcm_ops snd_emu10k1_playback_ops = { 
	.prepare =		snd_emu10k1_playback_prepare,

	.trigger =		snd_emu10k1_playback_trigger,

	.pointer =		snd_emu10k1_playback_pointer,

	.page =			snd_pcm_sgbuf_ops_page,

};



static const struct snd_pcm_ops snd_emu10k1_capture_ops = {
@@ -1390,7 +1389,6 @@ static const struct snd_pcm_ops snd_emu10k1_efx_playback_ops = { 
	.prepare =		snd_emu10k1_efx_playback_prepare,

	.trigger =		snd_emu10k1_efx_playback_trigger,

	.pointer =		snd_emu10k1_efx_playback_pointer,

	.page =			snd_pcm_sgbuf_ops_page,

};



int snd_emu10k1_pcm(struct snd_emu10k1 *emu, int device)

CRA Git | Maintained and supported by SUSTech CRA and CCSE