ALSA: lola: Use managed buffer allocation
authorTakashi Iwai <tiwai@suse.de>
Mon, 9 Dec 2019 09:49:16 +0000 (10:49 +0100)
committerTakashi Iwai <tiwai@suse.de>
Wed, 11 Dec 2019 06:25:13 +0000 (07:25 +0100)
Clean up the driver with the new managed buffer allocation API.
The superfluous snd_pcm_lib_malloc_pages() and
snd_pcm_lib_free_pages() calls are dropped.

Link: https://lore.kernel.org/r/20191209094943.14984-45-tiwai@suse.de
Signed-off-by: Takashi Iwai <tiwai@suse.de>
sound/pci/lola/lola_pcm.c

index 856bcca601283ffa45bba67fb5698e489d6dce6f..a01a068960842cc11dad5d8b2ff27b3122580f28 100644 (file)
@@ -282,8 +282,7 @@ static int lola_pcm_hw_params(struct snd_pcm_substream *substream,
        str->bufsize = 0;
        str->period_bytes = 0;
        str->format_verb = 0;
-       return snd_pcm_lib_malloc_pages(substream,
-                                       params_buffer_bytes(hw_params));
+       return 0;
 }
 
 static int lola_pcm_hw_free(struct snd_pcm_substream *substream)
@@ -296,7 +295,7 @@ static int lola_pcm_hw_free(struct snd_pcm_substream *substream)
        lola_stream_reset(chip, str);
        lola_cleanup_slave_streams(pcm, str);
        mutex_unlock(&chip->open_mutex);
-       return snd_pcm_lib_free_pages(substream);
+       return 0;
 }
 
 /*
@@ -610,9 +609,9 @@ int lola_create_pcm(struct lola *chip)
                        snd_pcm_set_ops(pcm, i, &lola_pcm_ops);
        }
        /* buffer pre-allocation */
-       snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_DEV_SG,
-                                             &chip->pci->dev,
-                                             1024 * 64, 32 * 1024 * 1024);
+       snd_pcm_set_managed_buffer_all(pcm, SNDRV_DMA_TYPE_DEV_SG,
+                                      &chip->pci->dev,
+                                      1024 * 64, 32 * 1024 * 1024);
        return 0;
 }