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

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.deSigned-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 30f2ce71
...@@ -436,7 +436,6 @@ static const struct snd_pcm_ops snd_vortex_playback_ops = { ...@@ -436,7 +436,6 @@ static const struct snd_pcm_ops snd_vortex_playback_ops = {
.prepare = snd_vortex_pcm_prepare, .prepare = snd_vortex_pcm_prepare,
.trigger = snd_vortex_pcm_trigger, .trigger = snd_vortex_pcm_trigger,
.pointer = snd_vortex_pcm_pointer, .pointer = snd_vortex_pcm_pointer,
.page = snd_pcm_sgbuf_ops_page,
}; };
/* /*
......
...@@ -545,7 +545,6 @@ static const struct snd_pcm_ops snd_bt87x_pcm_ops = { ...@@ -545,7 +545,6 @@ static const struct snd_pcm_ops snd_bt87x_pcm_ops = {
.prepare = snd_bt87x_prepare, .prepare = snd_bt87x_prepare,
.trigger = snd_bt87x_trigger, .trigger = snd_bt87x_trigger,
.pointer = snd_bt87x_pointer, .pointer = snd_bt87x_pointer,
.page = snd_pcm_sgbuf_ops_page,
}; };
static int snd_bt87x_capture_volume_info(struct snd_kcontrol *kcontrol, static int snd_bt87x_capture_volume_info(struct snd_kcontrol *kcontrol,
......
...@@ -379,7 +379,6 @@ static const struct snd_pcm_ops ct_pcm_playback_ops = { ...@@ -379,7 +379,6 @@ static const struct snd_pcm_ops ct_pcm_playback_ops = {
.prepare = ct_pcm_playback_prepare, .prepare = ct_pcm_playback_prepare,
.trigger = ct_pcm_playback_trigger, .trigger = ct_pcm_playback_trigger,
.pointer = ct_pcm_playback_pointer, .pointer = ct_pcm_playback_pointer,
.page = snd_pcm_sgbuf_ops_page,
}; };
/* PCM operators for capture */ /* PCM operators for capture */
...@@ -392,7 +391,6 @@ static const struct snd_pcm_ops ct_pcm_capture_ops = { ...@@ -392,7 +391,6 @@ static const struct snd_pcm_ops ct_pcm_capture_ops = {
.prepare = ct_pcm_capture_prepare, .prepare = ct_pcm_capture_prepare,
.trigger = ct_pcm_capture_trigger, .trigger = ct_pcm_capture_trigger,
.pointer = ct_pcm_capture_pointer, .pointer = ct_pcm_capture_pointer,
.page = snd_pcm_sgbuf_ops_page,
}; };
static const struct snd_pcm_chmap_elem surround_map[] = { static const struct snd_pcm_chmap_elem surround_map[] = {
......
...@@ -824,7 +824,6 @@ static const struct snd_pcm_ops analog_playback_ops = { ...@@ -824,7 +824,6 @@ static const struct snd_pcm_ops analog_playback_ops = {
.prepare = pcm_prepare, .prepare = pcm_prepare,
.trigger = pcm_trigger, .trigger = pcm_trigger,
.pointer = pcm_pointer, .pointer = pcm_pointer,
.page = snd_pcm_sgbuf_ops_page,
}; };
static const struct snd_pcm_ops analog_capture_ops = { static const struct snd_pcm_ops analog_capture_ops = {
.open = pcm_analog_in_open, .open = pcm_analog_in_open,
...@@ -835,7 +834,6 @@ static const struct snd_pcm_ops analog_capture_ops = { ...@@ -835,7 +834,6 @@ static const struct snd_pcm_ops analog_capture_ops = {
.prepare = pcm_prepare, .prepare = pcm_prepare,
.trigger = pcm_trigger, .trigger = pcm_trigger,
.pointer = pcm_pointer, .pointer = pcm_pointer,
.page = snd_pcm_sgbuf_ops_page,
}; };
#ifdef ECHOCARD_HAS_DIGITAL_IO #ifdef ECHOCARD_HAS_DIGITAL_IO
#ifndef ECHOCARD_HAS_VMIXER #ifndef ECHOCARD_HAS_VMIXER
...@@ -848,7 +846,6 @@ static const struct snd_pcm_ops digital_playback_ops = { ...@@ -848,7 +846,6 @@ static const struct snd_pcm_ops digital_playback_ops = {
.prepare = pcm_prepare, .prepare = pcm_prepare,
.trigger = pcm_trigger, .trigger = pcm_trigger,
.pointer = pcm_pointer, .pointer = pcm_pointer,
.page = snd_pcm_sgbuf_ops_page,
}; };
#endif /* !ECHOCARD_HAS_VMIXER */ #endif /* !ECHOCARD_HAS_VMIXER */
static const struct snd_pcm_ops digital_capture_ops = { static const struct snd_pcm_ops digital_capture_ops = {
...@@ -860,7 +857,6 @@ 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, .prepare = pcm_prepare,
.trigger = pcm_trigger, .trigger = pcm_trigger,
.pointer = pcm_pointer, .pointer = pcm_pointer,
.page = snd_pcm_sgbuf_ops_page,
}; };
#endif /* ECHOCARD_HAS_DIGITAL_IO */ #endif /* ECHOCARD_HAS_DIGITAL_IO */
......
...@@ -1366,7 +1366,6 @@ static const struct snd_pcm_ops snd_emu10k1_playback_ops = { ...@@ -1366,7 +1366,6 @@ static const struct snd_pcm_ops snd_emu10k1_playback_ops = {
.prepare = snd_emu10k1_playback_prepare, .prepare = snd_emu10k1_playback_prepare,
.trigger = snd_emu10k1_playback_trigger, .trigger = snd_emu10k1_playback_trigger,
.pointer = snd_emu10k1_playback_pointer, .pointer = snd_emu10k1_playback_pointer,
.page = snd_pcm_sgbuf_ops_page,
}; };
static const struct snd_pcm_ops snd_emu10k1_capture_ops = { 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 = { ...@@ -1390,7 +1389,6 @@ static const struct snd_pcm_ops snd_emu10k1_efx_playback_ops = {
.prepare = snd_emu10k1_efx_playback_prepare, .prepare = snd_emu10k1_efx_playback_prepare,
.trigger = snd_emu10k1_efx_playback_trigger, .trigger = snd_emu10k1_efx_playback_trigger,
.pointer = snd_emu10k1_efx_playback_pointer, .pointer = snd_emu10k1_efx_playback_pointer,
.page = snd_pcm_sgbuf_ops_page,
}; };
int snd_emu10k1_pcm(struct snd_emu10k1 *emu, int device) int snd_emu10k1_pcm(struct snd_emu10k1 *emu, int device)
......
...@@ -701,7 +701,6 @@ static const struct snd_pcm_ops azx_pcm_ops = { ...@@ -701,7 +701,6 @@ static const struct snd_pcm_ops azx_pcm_ops = {
.pointer = azx_pcm_pointer, .pointer = azx_pcm_pointer,
.get_time_info = azx_get_time_info, .get_time_info = azx_get_time_info,
.mmap = azx_pcm_mmap, .mmap = azx_pcm_mmap,
.page = snd_pcm_sgbuf_ops_page,
}; };
static void azx_pcm_free(struct snd_pcm *pcm) static void azx_pcm_free(struct snd_pcm *pcm)
......
...@@ -582,7 +582,6 @@ static const struct snd_pcm_ops lola_pcm_ops = { ...@@ -582,7 +582,6 @@ static const struct snd_pcm_ops lola_pcm_ops = {
.prepare = lola_pcm_prepare, .prepare = lola_pcm_prepare,
.trigger = lola_pcm_trigger, .trigger = lola_pcm_trigger,
.pointer = lola_pcm_pointer, .pointer = lola_pcm_pointer,
.page = snd_pcm_sgbuf_ops_page,
}; };
int lola_create_pcm(struct lola *chip) int lola_create_pcm(struct lola *chip)
......
...@@ -1661,7 +1661,6 @@ static const struct snd_pcm_ops snd_riptide_playback_ops = { ...@@ -1661,7 +1661,6 @@ static const struct snd_pcm_ops snd_riptide_playback_ops = {
.hw_params = snd_riptide_hw_params, .hw_params = snd_riptide_hw_params,
.hw_free = snd_riptide_hw_free, .hw_free = snd_riptide_hw_free,
.prepare = snd_riptide_prepare, .prepare = snd_riptide_prepare,
.page = snd_pcm_sgbuf_ops_page,
.trigger = snd_riptide_trigger, .trigger = snd_riptide_trigger,
.pointer = snd_riptide_pointer, .pointer = snd_riptide_pointer,
}; };
...@@ -1672,7 +1671,6 @@ static const struct snd_pcm_ops snd_riptide_capture_ops = { ...@@ -1672,7 +1671,6 @@ static const struct snd_pcm_ops snd_riptide_capture_ops = {
.hw_params = snd_riptide_hw_params, .hw_params = snd_riptide_hw_params,
.hw_free = snd_riptide_hw_free, .hw_free = snd_riptide_hw_free,
.prepare = snd_riptide_prepare, .prepare = snd_riptide_prepare,
.page = snd_pcm_sgbuf_ops_page,
.trigger = snd_riptide_trigger, .trigger = snd_riptide_trigger,
.pointer = snd_riptide_pointer, .pointer = snd_riptide_pointer,
}; };
......
...@@ -6368,7 +6368,6 @@ static const struct snd_pcm_ops snd_hdspm_ops = { ...@@ -6368,7 +6368,6 @@ static const struct snd_pcm_ops snd_hdspm_ops = {
.prepare = snd_hdspm_prepare, .prepare = snd_hdspm_prepare,
.trigger = snd_hdspm_trigger, .trigger = snd_hdspm_trigger,
.pointer = snd_hdspm_hw_pointer, .pointer = snd_hdspm_hw_pointer,
.page = snd_pcm_sgbuf_ops_page,
}; };
static int snd_hdspm_create_hwdep(struct snd_card *card, static int snd_hdspm_create_hwdep(struct snd_card *card,
......
...@@ -2076,7 +2076,6 @@ static const struct snd_pcm_ops snd_trident_nx_playback_ops = { ...@@ -2076,7 +2076,6 @@ static const struct snd_pcm_ops snd_trident_nx_playback_ops = {
.prepare = snd_trident_playback_prepare, .prepare = snd_trident_playback_prepare,
.trigger = snd_trident_trigger, .trigger = snd_trident_trigger,
.pointer = snd_trident_playback_pointer, .pointer = snd_trident_playback_pointer,
.page = snd_pcm_sgbuf_ops_page,
}; };
static const struct snd_pcm_ops snd_trident_capture_ops = { static const struct snd_pcm_ops snd_trident_capture_ops = {
...@@ -2121,7 +2120,6 @@ static const struct snd_pcm_ops snd_trident_nx_foldback_ops = { ...@@ -2121,7 +2120,6 @@ static const struct snd_pcm_ops snd_trident_nx_foldback_ops = {
.prepare = snd_trident_foldback_prepare, .prepare = snd_trident_foldback_prepare,
.trigger = snd_trident_trigger, .trigger = snd_trident_trigger,
.pointer = snd_trident_playback_pointer, .pointer = snd_trident_playback_pointer,
.page = snd_pcm_sgbuf_ops_page,
}; };
static const struct snd_pcm_ops snd_trident_spdif_ops = { static const struct snd_pcm_ops snd_trident_spdif_ops = {
......
...@@ -1363,7 +1363,6 @@ static const struct snd_pcm_ops snd_via686_playback_ops = { ...@@ -1363,7 +1363,6 @@ static const struct snd_pcm_ops snd_via686_playback_ops = {
.prepare = snd_via686_playback_prepare, .prepare = snd_via686_playback_prepare,
.trigger = snd_via82xx_pcm_trigger, .trigger = snd_via82xx_pcm_trigger,
.pointer = snd_via686_pcm_pointer, .pointer = snd_via686_pcm_pointer,
.page = snd_pcm_sgbuf_ops_page,
}; };
/* via686 capture callbacks */ /* via686 capture callbacks */
...@@ -1376,7 +1375,6 @@ static const struct snd_pcm_ops snd_via686_capture_ops = { ...@@ -1376,7 +1375,6 @@ static const struct snd_pcm_ops snd_via686_capture_ops = {
.prepare = snd_via686_capture_prepare, .prepare = snd_via686_capture_prepare,
.trigger = snd_via82xx_pcm_trigger, .trigger = snd_via82xx_pcm_trigger,
.pointer = snd_via686_pcm_pointer, .pointer = snd_via686_pcm_pointer,
.page = snd_pcm_sgbuf_ops_page,
}; };
/* via823x DSX playback callbacks */ /* via823x DSX playback callbacks */
...@@ -1389,7 +1387,6 @@ static const struct snd_pcm_ops snd_via8233_playback_ops = { ...@@ -1389,7 +1387,6 @@ static const struct snd_pcm_ops snd_via8233_playback_ops = {
.prepare = snd_via8233_playback_prepare, .prepare = snd_via8233_playback_prepare,
.trigger = snd_via82xx_pcm_trigger, .trigger = snd_via82xx_pcm_trigger,
.pointer = snd_via8233_pcm_pointer, .pointer = snd_via8233_pcm_pointer,
.page = snd_pcm_sgbuf_ops_page,
}; };
/* via823x multi-channel playback callbacks */ /* via823x multi-channel playback callbacks */
...@@ -1402,7 +1399,6 @@ static const struct snd_pcm_ops snd_via8233_multi_ops = { ...@@ -1402,7 +1399,6 @@ static const struct snd_pcm_ops snd_via8233_multi_ops = {
.prepare = snd_via8233_multi_prepare, .prepare = snd_via8233_multi_prepare,
.trigger = snd_via82xx_pcm_trigger, .trigger = snd_via82xx_pcm_trigger,
.pointer = snd_via8233_pcm_pointer, .pointer = snd_via8233_pcm_pointer,
.page = snd_pcm_sgbuf_ops_page,
}; };
/* via823x capture callbacks */ /* via823x capture callbacks */
...@@ -1415,7 +1411,6 @@ static const struct snd_pcm_ops snd_via8233_capture_ops = { ...@@ -1415,7 +1411,6 @@ static const struct snd_pcm_ops snd_via8233_capture_ops = {
.prepare = snd_via8233_capture_prepare, .prepare = snd_via8233_capture_prepare,
.trigger = snd_via82xx_pcm_trigger, .trigger = snd_via82xx_pcm_trigger,
.pointer = snd_via8233_pcm_pointer, .pointer = snd_via8233_pcm_pointer,
.page = snd_pcm_sgbuf_ops_page,
}; };
......
...@@ -801,7 +801,6 @@ static const struct snd_pcm_ops snd_via686_playback_ops = { ...@@ -801,7 +801,6 @@ static const struct snd_pcm_ops snd_via686_playback_ops = {
.prepare = snd_via82xx_pcm_prepare, .prepare = snd_via82xx_pcm_prepare,
.trigger = snd_via82xx_pcm_trigger, .trigger = snd_via82xx_pcm_trigger,
.pointer = snd_via686_pcm_pointer, .pointer = snd_via686_pcm_pointer,
.page = snd_pcm_sgbuf_ops_page,
}; };
/* via686 capture callbacks */ /* via686 capture callbacks */
...@@ -814,7 +813,6 @@ static const struct snd_pcm_ops snd_via686_capture_ops = { ...@@ -814,7 +813,6 @@ static const struct snd_pcm_ops snd_via686_capture_ops = {
.prepare = snd_via82xx_pcm_prepare, .prepare = snd_via82xx_pcm_prepare,
.trigger = snd_via82xx_pcm_trigger, .trigger = snd_via82xx_pcm_trigger,
.pointer = snd_via686_pcm_pointer, .pointer = snd_via686_pcm_pointer,
.page = snd_pcm_sgbuf_ops_page,
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment