ASoC: sh: Drop superfluous PCM preallocation error checks

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

Acked-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
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/sh/fsi.c b/sound/soc/sh/fsi.c
index aa7e902f0c0252fda0c29ee87ee27e47e6ee5800..285afbafa662b9c579a905e8b2ce9a7596cfbc15 100644 (file)
--- a/sound/soc/sh/fsi.c
+++ b/sound/soc/sh/fsi.c
@@ -1768,11 +1768,12 @@ static const struct snd_pcm_ops fsi_pcm_ops = {
 
 static int fsi_pcm_new(struct snd_soc_pcm_runtime *rtd)
 {
-       return snd_pcm_lib_preallocate_pages_for_all(
+       snd_pcm_lib_preallocate_pages_for_all(
                rtd->pcm,
                SNDRV_DMA_TYPE_DEV,
                rtd->card->snd_card->dev,
                PREALLOC_BUFFER, PREALLOC_BUFFER_MAX);
+       return 0;
 }
 
 /*

diff --git a/sound/soc/sh/rcar/core.c b/sound/soc/sh/rcar/core.c
index 59e250cc2e9df285d778d7939a4812a3c90219df..29213b90755fe0d18ed6567e4cb3b276a183ead0 100644 (file)
--- a/sound/soc/sh/rcar/core.c
+++ b/sound/soc/sh/rcar/core.c
@@ -1575,7 +1575,6 @@ static int rsnd_preallocate_pages(struct snd_soc_pcm_runtime *rtd,
        struct rsnd_priv *priv = rsnd_io_to_priv(io);
        struct device *dev = rsnd_priv_to_dev(priv);
        struct snd_pcm_substream *substream;
-       int err;
 
        /*
         * use Audio-DMAC dev if we can use IPMMU
@@ -1588,12 +1587,10 @@ static int rsnd_preallocate_pages(struct snd_soc_pcm_runtime *rtd,
        for (substream = rtd->pcm->streams[stream].substream;
             substream;
             substream = substream->next) {
-               err = snd_pcm_lib_preallocate_pages(substream,
+               snd_pcm_lib_preallocate_pages(substream,
                                        SNDRV_DMA_TYPE_DEV,
                                        dev,
                                        PREALLOC_BUFFER, PREALLOC_BUFFER_MAX);
-               if (err < 0)
-                       return err;
        }
 
        return 0;

diff --git a/sound/soc/sh/siu_pcm.c b/sound/soc/sh/siu_pcm.c
index 23384c477740cb62f328da7c8deaab409f731d3c..78c3145b4109ff3ecd4bb93a9430c636c1b7d9de 100644 (file)
--- a/sound/soc/sh/siu_pcm.c
+++ b/sound/soc/sh/siu_pcm.c
@@ -541,15 +541,9 @@ static int siu_pcm_new(struct snd_soc_pcm_runtime *rtd)
                if (ret < 0)
                        return ret;
 
-               ret = snd_pcm_lib_preallocate_pages_for_all(pcm,
+               snd_pcm_lib_preallocate_pages_for_all(pcm,
                                SNDRV_DMA_TYPE_DEV, card->dev,
                                SIU_BUFFER_BYTES_MAX, SIU_BUFFER_BYTES_MAX);
-               if (ret < 0) {
-                       dev_err(card->dev,
-                              "snd_pcm_lib_preallocate_pages_for_all() err=%d",
-                               ret);
-                       goto fail;
-               }
 
                (*port_info)->pcm = pcm;
 
@@ -562,11 +556,6 @@ static int siu_pcm_new(struct snd_soc_pcm_runtime *rtd)
 
        dev_info(card->dev, "SuperH SIU driver initialized.\n");
        return 0;
-
-fail:
-       siu_free_port(siu_ports[pdev->id]);
-       dev_err(card->dev, "SIU: failed to initialize.\n");
-       return ret;
 }
 
 static void siu_pcm_free(struct snd_pcm *pcm)