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.

(*) 7e8edae39fd1: 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: Takashi Iwai <tiwai@suse.de>

diff --git a/sound/pci/au88x0/au88x0_pcm.c b/sound/pci/au88x0/au88x0_pcm.c
index 39ea9ef00f472f1e6ea6df55cd21996c57c74d1c..b835042893d924f1baa49dcbca6e98b1ec315c51 100644 (file)
--- a/sound/pci/au88x0/au88x0_pcm.c
+++ b/sound/pci/au88x0/au88x0_pcm.c
@@ -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,
 };
 
 /*

diff --git a/sound/pci/bt87x.c b/sound/pci/bt87x.c
index 66a5a24e75584d6e0ac84dd89631d114841cc02d..d4b6da79ef49f4ed5d6cf666ed1205f98bcc3654 100644 (file)
--- a/sound/pci/bt87x.c
+++ b/sound/pci/bt87x.c
@@ -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,

diff --git a/sound/pci/ctxfi/ctpcm.c b/sound/pci/ctxfi/ctpcm.c
index 89923399e64669c9ca1d444686f9f3e2f2af5bc2..c341f509e4fc82e2fb18cdca1065ad9d8a194962 100644 (file)
--- a/sound/pci/ctxfi/ctpcm.c
+++ b/sound/pci/ctxfi/ctpcm.c
@@ -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[] = {

diff --git a/sound/pci/echoaudio/echoaudio.c b/sound/pci/echoaudio/echoaudio.c
index ca9125726be24bbba9252fc82873f6d0cf9f6e40..40877e478bb6d4a4119f6f01431953a72defd528 100644 (file)
--- a/sound/pci/echoaudio/echoaudio.c
+++ b/sound/pci/echoaudio/echoaudio.c
@@ -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 */
 

diff --git a/sound/pci/emu10k1/emupcm.c b/sound/pci/emu10k1/emupcm.c
index 6530a55fb87802d6c6ea9bf280aaea0e4fb95abc..46d8768adc019b8848d38351cebf996fb4711ec9 100644 (file)
--- a/sound/pci/emu10k1/emupcm.c
+++ b/sound/pci/emu10k1/emupcm.c
@@ -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)

diff --git a/sound/pci/hda/hda_controller.c b/sound/pci/hda/hda_controller.c
index 6387c7e90918112c6deace1cd19416036709c091..2f3b7a35f2d9cdb3b9262d220c962336f6653205 100644 (file)
--- a/sound/pci/hda/hda_controller.c
+++ b/sound/pci/hda/hda_controller.c
@@ -701,7 +701,6 @@ static const struct snd_pcm_ops azx_pcm_ops = {
        .pointer = azx_pcm_pointer,
        .get_time_info =  azx_get_time_info,
        .mmap = azx_pcm_mmap,
-       .page = snd_pcm_sgbuf_ops_page,
 };
 
 static void azx_pcm_free(struct snd_pcm *pcm)

diff --git a/sound/pci/lola/lola_pcm.c b/sound/pci/lola/lola_pcm.c
index 151f7cf5ce0e54e645539e0ef3782f1956fa3d66..f032d7ceb6e5d242128bf444725877e2d94fd8a4 100644 (file)
--- a/sound/pci/lola/lola_pcm.c
+++ b/sound/pci/lola/lola_pcm.c
@@ -582,7 +582,6 @@ static const struct snd_pcm_ops lola_pcm_ops = {
        .prepare = lola_pcm_prepare,
        .trigger = lola_pcm_trigger,
        .pointer = lola_pcm_pointer,
-       .page = snd_pcm_sgbuf_ops_page,
 };
 
 int lola_create_pcm(struct lola *chip)

diff --git a/sound/pci/riptide/riptide.c b/sound/pci/riptide/riptide.c
index 58771ae0ed631877f2a0a2bbf776192e65f10269..ac10d6f229d8055bdf924a12787e743519038b74 100644 (file)
--- a/sound/pci/riptide/riptide.c
+++ b/sound/pci/riptide/riptide.c
@@ -1661,7 +1661,6 @@ static const struct snd_pcm_ops snd_riptide_playback_ops = {
        .hw_params = snd_riptide_hw_params,
        .hw_free = snd_riptide_hw_free,
        .prepare = snd_riptide_prepare,
-       .page = snd_pcm_sgbuf_ops_page,
        .trigger = snd_riptide_trigger,
        .pointer = snd_riptide_pointer,
 };
@@ -1672,7 +1671,6 @@ static const struct snd_pcm_ops snd_riptide_capture_ops = {
        .hw_params = snd_riptide_hw_params,
        .hw_free = snd_riptide_hw_free,
        .prepare = snd_riptide_prepare,
-       .page = snd_pcm_sgbuf_ops_page,
        .trigger = snd_riptide_trigger,
        .pointer = snd_riptide_pointer,
 };

diff --git a/sound/pci/rme9652/hdspm.c b/sound/pci/rme9652/hdspm.c
index 81a6f4b2bd3c52c93abc6a35a83c1e24437fa57e..b571d9d017bb551e28ca12bd7d24b598aa46570e 100644 (file)
--- a/sound/pci/rme9652/hdspm.c
+++ b/sound/pci/rme9652/hdspm.c
@@ -6368,7 +6368,6 @@ static const struct snd_pcm_ops snd_hdspm_ops = {
        .prepare = snd_hdspm_prepare,
        .trigger = snd_hdspm_trigger,
        .pointer = snd_hdspm_hw_pointer,
-       .page = snd_pcm_sgbuf_ops_page,
 };
 
 static int snd_hdspm_create_hwdep(struct snd_card *card,

diff --git a/sound/pci/trident/trident_main.c b/sound/pci/trident/trident_main.c
index 1a6f6202fd1681e5d797e08b56a1356d5e05dc4a..8ac6f541b008304a6dfa45377e69465d283bf0a3 100644 (file)
--- a/sound/pci/trident/trident_main.c
+++ b/sound/pci/trident/trident_main.c
@@ -2076,7 +2076,6 @@ static const struct snd_pcm_ops snd_trident_nx_playback_ops = {
        .prepare =      snd_trident_playback_prepare,
        .trigger =      snd_trident_trigger,
        .pointer =      snd_trident_playback_pointer,
-       .page =         snd_pcm_sgbuf_ops_page,
 };
 
 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 = {
        .prepare =      snd_trident_foldback_prepare,
        .trigger =      snd_trident_trigger,
        .pointer =      snd_trident_playback_pointer,
-       .page =         snd_pcm_sgbuf_ops_page,
 };
 
 static const struct snd_pcm_ops snd_trident_spdif_ops = {

diff --git a/sound/pci/via82xx.c b/sound/pci/via82xx.c
index 38601d0dfb73b533af10b67a0ce7836887b803ea..902409dbc4c8382d5133ceff1b1abc2be509ac0c 100644 (file)
--- a/sound/pci/via82xx.c
+++ b/sound/pci/via82xx.c
@@ -1363,7 +1363,6 @@ static const struct snd_pcm_ops snd_via686_playback_ops = {
        .prepare =      snd_via686_playback_prepare,
        .trigger =      snd_via82xx_pcm_trigger,
        .pointer =      snd_via686_pcm_pointer,
-       .page =         snd_pcm_sgbuf_ops_page,
 };
 
 /* via686 capture callbacks */
@@ -1376,7 +1375,6 @@ static const struct snd_pcm_ops snd_via686_capture_ops = {
        .prepare =      snd_via686_capture_prepare,
        .trigger =      snd_via82xx_pcm_trigger,
        .pointer =      snd_via686_pcm_pointer,
-       .page =         snd_pcm_sgbuf_ops_page,
 };
 
 /* via823x DSX playback callbacks */
@@ -1389,7 +1387,6 @@ static const struct snd_pcm_ops snd_via8233_playback_ops = {
        .prepare =      snd_via8233_playback_prepare,
        .trigger =      snd_via82xx_pcm_trigger,
        .pointer =      snd_via8233_pcm_pointer,
-       .page =         snd_pcm_sgbuf_ops_page,
 };
 
 /* via823x multi-channel playback callbacks */
@@ -1402,7 +1399,6 @@ static const struct snd_pcm_ops snd_via8233_multi_ops = {
        .prepare =      snd_via8233_multi_prepare,
        .trigger =      snd_via82xx_pcm_trigger,
        .pointer =      snd_via8233_pcm_pointer,
-       .page =         snd_pcm_sgbuf_ops_page,
 };
 
 /* via823x capture callbacks */
@@ -1415,7 +1411,6 @@ static const struct snd_pcm_ops snd_via8233_capture_ops = {
        .prepare =      snd_via8233_capture_prepare,
        .trigger =      snd_via82xx_pcm_trigger,
        .pointer =      snd_via8233_pcm_pointer,
-       .page =         snd_pcm_sgbuf_ops_page,
 };
 
 

diff --git a/sound/pci/via82xx_modem.c b/sound/pci/via82xx_modem.c
index bfb5e1b89d5f8f60fb99d1c1eae5f0b7961ef39c..2c8370cf03b338ce66743e8d18973b131fa34f10 100644 (file)
--- a/sound/pci/via82xx_modem.c
+++ b/sound/pci/via82xx_modem.c
@@ -801,7 +801,6 @@ static const struct snd_pcm_ops snd_via686_playback_ops = {
        .prepare =      snd_via82xx_pcm_prepare,
        .trigger =      snd_via82xx_pcm_trigger,
        .pointer =      snd_via686_pcm_pointer,
-       .page =         snd_pcm_sgbuf_ops_page,
 };
 
 /* via686 capture callbacks */
@@ -814,7 +813,6 @@ static const struct snd_pcm_ops snd_via686_capture_ops = {
        .prepare =      snd_via82xx_pcm_prepare,
        .trigger =      snd_via82xx_pcm_trigger,
        .pointer =      snd_via686_pcm_pointer,
-       .page =         snd_pcm_sgbuf_ops_page,
 };