ASoC: soc-pcm: indicate error message at dpcm_apply_symmetry()
authorKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Mon, 15 Mar 2021 00:58:02 +0000 (09:58 +0900)
committerMark Brown <broonie@kernel.org>
Fri, 19 Mar 2021 12:23:57 +0000 (12:23 +0000)
Indicating error message when failed case is very useful for debuging.
In many case, its style is like below.

int function(...)
{
...
return ret;
}

int caller(...)
{
...
ret = function(...);
if (ret < 0)
dev_err(...)
...
}

This is not so bad, but in this style *each caller* needs to indicate
duplicate same error message, and some caller is forgetting to do it.
And caller can't indicate detail function() error information.

If function() indicates error message, we can get same and
detail information without forgot.

int function(...)
{
...
if (ret < 0)
dev_err(...)

return ret;
}

int caller(...)
{
...
ret = function(...);
...
}

This patch follow above style at dpcm_apply_symmetry(...)

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Link: https://lore.kernel.org/r/87k0q9utb9.wl-kuninori.morimoto.gx@renesas.com
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/soc-pcm.c

index 35c62062b8f8b1e7c62f08e4c1418f6999f7034f..855904c0938dca3ad3ee76e07c93d27892d4416b 100644 (file)
@@ -1706,7 +1706,7 @@ static int dpcm_apply_symmetry(struct snd_pcm_substream *fe_substream,
                /* Symmetry only applies if we've got an active stream. */
                err = soc_pcm_apply_symmetry(fe_substream, fe_cpu_dai);
                if (err < 0)
-                       return err;
+                       goto error;
        }
 
        /* apply symmetry for BE */
@@ -1731,11 +1731,14 @@ static int dpcm_apply_symmetry(struct snd_pcm_substream *fe_substream,
                for_each_rtd_dais(rtd, i, dai) {
                        err = soc_pcm_apply_symmetry(fe_substream, dai);
                        if (err < 0)
-                               return err;
+                               goto error;
                }
        }
+error:
+       if (err < 0)
+               dev_err(fe->dev, "ASoC: %s failed (%d)\n", __func__, err);
 
-       return 0;
+       return err;
 }
 
 static int dpcm_fe_dai_startup(struct snd_pcm_substream *fe_substream)
@@ -1767,9 +1770,6 @@ static int dpcm_fe_dai_startup(struct snd_pcm_substream *fe_substream)
        dpcm_runtime_setup_be_rate(fe_substream);
 
        ret = dpcm_apply_symmetry(fe_substream, stream);
-       if (ret < 0)
-               dev_err(fe->dev, "ASoC: failed to apply dpcm symmetry %d\n",
-                       ret);
 
 unwind:
        if (ret < 0)