ASoC: intel: 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/intel/atom/sst-mfld-platform-pcm.c b/sound/soc/intel/atom/sst-mfld-platform-pcm.c
index 91a2436ce9525aea53c537ba1f879456050fcc66..985abda3bfbb30fec14e06876ec2240debac1491 100644 (file)
--- a/sound/soc/intel/atom/sst-mfld-platform-pcm.c
+++ b/sound/soc/intel/atom/sst-mfld-platform-pcm.c
@@ -687,20 +687,15 @@ static int sst_pcm_new(struct snd_soc_pcm_runtime *rtd)
 {
        struct snd_soc_dai *dai = rtd->cpu_dai;
        struct snd_pcm *pcm = rtd->pcm;
-       int retval = 0;
 
        if (dai->driver->playback.channels_min ||
                        dai->driver->capture.channels_min) {
-               retval =  snd_pcm_lib_preallocate_pages_for_all(pcm,
+               snd_pcm_lib_preallocate_pages_for_all(pcm,
                        SNDRV_DMA_TYPE_CONTINUOUS,
                        snd_dma_continuous_data(GFP_DMA),
                        SST_MIN_BUFFER, SST_MAX_BUFFER);
-               if (retval) {
-                       dev_err(rtd->dev, "dma buffer allocation failure\n");
-                       return retval;
-               }
        }
-       return retval;
+       return 0;
 }
 
 static int sst_soc_probe(struct snd_soc_component *component)

diff --git a/sound/soc/intel/baytrail/sst-baytrail-pcm.c b/sound/soc/intel/baytrail/sst-baytrail-pcm.c
index aabb35bf6b963d86ab6f7e26d8f17f4c8460d37b..aa358073ac0f01ac6147dfa739259ccea209f589 100644 (file)
--- a/sound/soc/intel/baytrail/sst-baytrail-pcm.c
+++ b/sound/soc/intel/baytrail/sst-baytrail-pcm.c
@@ -327,23 +327,16 @@ static int sst_byt_pcm_new(struct snd_soc_pcm_runtime *rtd)
        size_t size;
        struct snd_soc_component *component = snd_soc_rtdcom_lookup(rtd, DRV_NAME);
        struct sst_pdata *pdata = dev_get_platdata(component->dev);
-       int ret = 0;
 
        if (pcm->streams[SNDRV_PCM_STREAM_PLAYBACK].substream ||
            pcm->streams[SNDRV_PCM_STREAM_CAPTURE].substream) {
                size = sst_byt_pcm_hardware.buffer_bytes_max;
-               ret = snd_pcm_lib_preallocate_pages_for_all(pcm,
-                                                           SNDRV_DMA_TYPE_DEV,
-                                                           pdata->dma_dev,
-                                                           size, size);
-               if (ret) {
-                       dev_err(rtd->dev, "dma buffer allocation failed %d\n",
-                               ret);
-                       return ret;
-               }
+               snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_DEV,
+                                                     pdata->dma_dev,
+                                                     size, size);
        }
 
-       return ret;
+       return 0;
 }
 
 static struct snd_soc_dai_driver byt_dais[] = {

diff --git a/sound/soc/intel/haswell/sst-haswell-pcm.c b/sound/soc/intel/haswell/sst-haswell-pcm.c
index fe2c826e710c73bba7053900514504d3abd71d1f..f21a7f2c11c263c9df2995e7a462714f957f9c6a 100644 (file)
--- a/sound/soc/intel/haswell/sst-haswell-pcm.c
+++ b/sound/soc/intel/haswell/sst-haswell-pcm.c
@@ -946,27 +946,21 @@ static int hsw_pcm_new(struct snd_soc_pcm_runtime *rtd)
        struct sst_pdata *pdata = dev_get_platdata(component->dev);
        struct hsw_priv_data *priv_data = dev_get_drvdata(component->dev);
        struct device *dev = pdata->dma_dev;
-       int ret = 0;
 
        if (pcm->streams[SNDRV_PCM_STREAM_PLAYBACK].substream ||
                        pcm->streams[SNDRV_PCM_STREAM_CAPTURE].substream) {
-               ret = snd_pcm_lib_preallocate_pages_for_all(pcm,
+               snd_pcm_lib_preallocate_pages_for_all(pcm,
                        SNDRV_DMA_TYPE_DEV_SG,
                        dev,
                        hsw_pcm_hardware.buffer_bytes_max,
                        hsw_pcm_hardware.buffer_bytes_max);
-               if (ret) {
-                       dev_err(rtd->dev, "dma buffer allocation failed %d\n",
-                               ret);
-                       return ret;
-               }
        }
        if (pcm->streams[SNDRV_PCM_STREAM_PLAYBACK].substream)
                priv_data->pcm[rtd->cpu_dai->id][SNDRV_PCM_STREAM_PLAYBACK].hsw_pcm = pcm;
        if (pcm->streams[SNDRV_PCM_STREAM_CAPTURE].substream)
                priv_data->pcm[rtd->cpu_dai->id][SNDRV_PCM_STREAM_CAPTURE].hsw_pcm = pcm;
 
-       return ret;
+       return 0;
 }
 
 #define HSW_FORMATS \

diff --git a/sound/soc/intel/skylake/skl-pcm.c b/sound/soc/intel/skylake/skl-pcm.c
index 557f80c0bfe5307e4ceb842c1d22707180485d95..20c88c677473c8406cf53c4049c5853919d377ca 100644 (file)
--- a/sound/soc/intel/skylake/skl-pcm.c
+++ b/sound/soc/intel/skylake/skl-pcm.c
@@ -1289,7 +1289,6 @@ static int skl_pcm_new(struct snd_soc_pcm_runtime *rtd)
        struct hdac_bus *bus = dev_get_drvdata(dai->dev);
        struct snd_pcm *pcm = rtd->pcm;
        unsigned int size;
-       int retval = 0;
        struct skl *skl = bus_to_skl(bus);
 
        if (dai->driver->playback.channels_min ||
@@ -1298,17 +1297,13 @@ static int skl_pcm_new(struct snd_soc_pcm_runtime *rtd)
                size = CONFIG_SND_HDA_PREALLOC_SIZE * 1024;
                if (size > MAX_PREALLOC_SIZE)
                        size = MAX_PREALLOC_SIZE;
-               retval = snd_pcm_lib_preallocate_pages_for_all(pcm,
+               snd_pcm_lib_preallocate_pages_for_all(pcm,
                                                SNDRV_DMA_TYPE_DEV_SG,
                                                snd_dma_pci_data(skl->pci),
                                                size, MAX_PREALLOC_SIZE);
-               if (retval) {
-                       dev_err(dai->dev, "dma buffer allocation fail\n");
-                       return retval;
-               }
        }
 
-       return retval;
+       return 0;
 }
 
 static int skl_get_module_info(struct skl *skl, struct skl_module_cfg *mconfig)