ASoC: fsi: Use managed buffer allocation
authorTakashi Iwai <tiwai@suse.de>
Tue, 10 Dec 2019 14:25:58 +0000 (15:25 +0100)
committerMark Brown <broonie@kernel.org>
Wed, 11 Dec 2019 16:45:53 +0000 (16:45 +0000)
Clean up the driver with the new managed buffer allocation API.
The hw_params and hw_free callbacks became superfluous and got
dropped.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
Link: https://lore.kernel.org/r/20191210142614.19405-8-tiwai@suse.de
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/sh/fsi.c

index e384fdc..1cebddd 100644 (file)
@@ -1732,20 +1732,6 @@ static int fsi_pcm_open(struct snd_soc_component *component,
        return ret;
 }
 
-static int fsi_hw_params(struct snd_soc_component *component,
-                        struct snd_pcm_substream *substream,
-                        struct snd_pcm_hw_params *hw_params)
-{
-       return snd_pcm_lib_malloc_pages(substream,
-                                       params_buffer_bytes(hw_params));
-}
-
-static int fsi_hw_free(struct snd_soc_component *component,
-                      struct snd_pcm_substream *substream)
-{
-       return snd_pcm_lib_free_pages(substream);
-}
-
 static snd_pcm_uframes_t fsi_pointer(struct snd_soc_component *component,
                                     struct snd_pcm_substream *substream)
 {
@@ -1765,7 +1751,7 @@ static snd_pcm_uframes_t fsi_pointer(struct snd_soc_component *component,
 static int fsi_pcm_new(struct snd_soc_component *component,
                       struct snd_soc_pcm_runtime *rtd)
 {
-       snd_pcm_lib_preallocate_pages_for_all(
+       snd_pcm_set_managed_buffer_all(
                rtd->pcm,
                SNDRV_DMA_TYPE_DEV,
                rtd->card->snd_card->dev,
@@ -1816,8 +1802,6 @@ static const struct snd_soc_component_driver fsi_soc_component = {
        .name           = "fsi",
        .open           = fsi_pcm_open,
        .ioctl          = snd_soc_pcm_lib_ioctl,
-       .hw_params      = fsi_hw_params,
-       .hw_free        = fsi_hw_free,
        .pointer        = fsi_pointer,
        .pcm_construct  = fsi_pcm_new,
 };