ASoC: amd: Drop superfluous PCM preallocation error checks

snd_pcm_lib_preallocate_pages() and co always succeed, so the error
check is simply redundant.  Drop it.

Reviewed-by: Jaroslav Kysela <perex@perex.cz>
Acked-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Takashi Iwai <tiwai@suse.de>

diff --git a/sound/soc/amd/acp-pcm-dma.c b/sound/soc/amd/acp-pcm-dma.c
index f4011bebc7ec0fec945464ad62f9986b76256e87..2391c7f1dd2dbcf2c69feddd8780041f02dd7370 100644 (file)
--- a/sound/soc/amd/acp-pcm-dma.c
+++ b/sound/soc/amd/acp-pcm-dma.c
@@ -1142,7 +1142,6 @@ static int acp_dma_trigger(struct snd_pcm_substream *substream, int cmd)
 
 static int acp_dma_new(struct snd_soc_pcm_runtime *rtd)
 {
-       int ret;
        struct snd_soc_component *component = snd_soc_rtdcom_lookup(rtd,
                                                                    DRV_NAME);
        struct audio_drv_data *adata = dev_get_drvdata(component->dev);
@@ -1150,24 +1149,21 @@ static int acp_dma_new(struct snd_soc_pcm_runtime *rtd)
 
        switch (adata->asic_type) {
        case CHIP_STONEY:
-               ret = snd_pcm_lib_preallocate_pages_for_all(rtd->pcm,
-                                                           SNDRV_DMA_TYPE_DEV,
-                                                           parent,
-                                                           ST_MIN_BUFFER,
-                                                           ST_MAX_BUFFER);
+               snd_pcm_lib_preallocate_pages_for_all(rtd->pcm,
+                                                     SNDRV_DMA_TYPE_DEV,
+                                                     parent,
+                                                     ST_MIN_BUFFER,
+                                                     ST_MAX_BUFFER);
                break;
        default:
-               ret = snd_pcm_lib_preallocate_pages_for_all(rtd->pcm,
-                                                           SNDRV_DMA_TYPE_DEV,
-                                                           parent,
-                                                           MIN_BUFFER,
-                                                           MAX_BUFFER);
+               snd_pcm_lib_preallocate_pages_for_all(rtd->pcm,
+                                                     SNDRV_DMA_TYPE_DEV,
+                                                     parent,
+                                                     MIN_BUFFER,
+                                                     MAX_BUFFER);
                break;
        }
-       if (ret < 0)
-               dev_err(component->dev,
-                       "buffer preallocation failure error:%d\n", ret);
-       return ret;
+       return 0;
 }
 
 static int acp_dma_close(struct snd_pcm_substream *substream)

diff --git a/sound/soc/amd/raven/acp3x-pcm-dma.c b/sound/soc/amd/raven/acp3x-pcm-dma.c
index 3e7d4099364cb85792ec616a2ac9f85c6777791d..1a2e15ff145648abb2b914b9c0625875da1e2424 100644 (file)
--- a/sound/soc/amd/raven/acp3x-pcm-dma.c
+++ b/sound/soc/amd/raven/acp3x-pcm-dma.c
@@ -367,11 +367,10 @@ static snd_pcm_uframes_t acp3x_dma_pointer(struct snd_pcm_substream *substream)
 
 static int acp3x_dma_new(struct snd_soc_pcm_runtime *rtd)
 {
-       return snd_pcm_lib_preallocate_pages_for_all(rtd->pcm,
-                                                    SNDRV_DMA_TYPE_DEV,
-                                                    rtd->pcm->card->dev,
-                                                    MIN_BUFFER,
-                                                    MAX_BUFFER);
+       snd_pcm_lib_preallocate_pages_for_all(rtd->pcm, SNDRV_DMA_TYPE_DEV,
+                                             rtd->pcm->card->dev,
+                                             MIN_BUFFER, MAX_BUFFER);
+       return 0;
 }
 
 static int acp3x_dma_hw_free(struct snd_pcm_substream *substream)