]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
ASoC: Refactor symmetric_rates check to reduce indentation
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Tue, 8 Mar 2011 00:11:15 +0000 (00:11 +0000)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Tue, 8 Mar 2011 18:56:26 +0000 (18:56 +0000)
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Liam Girdwood <lrg@ti.com>
sound/soc/soc-core.c

index c2ec6cb05631a3748c3dd6689096421eaeb13f74..65ff61211a85c296363173c41d5679759153651c 100644 (file)
@@ -500,20 +500,20 @@ static int soc_pcm_apply_symmetry(struct snd_pcm_substream *substream)
        struct snd_soc_dai *codec_dai = rtd->codec_dai;
        int ret;
 
-       if (codec_dai->driver->symmetric_rates || cpu_dai->driver->symmetric_rates ||
-                       rtd->dai_link->symmetric_rates) {
-               dev_dbg(&rtd->dev, "Symmetry forces %dHz rate\n",
-                               rtd->rate);
-
-               ret = snd_pcm_hw_constraint_minmax(substream->runtime,
-                                                  SNDRV_PCM_HW_PARAM_RATE,
-                                                  rtd->rate,
-                                                  rtd->rate);
-               if (ret < 0) {
-                       dev_err(&rtd->dev,
-                               "Unable to apply rate symmetry constraint: %d\n", ret);
-                       return ret;
-               }
+       if (!codec_dai->driver->symmetric_rates &&
+           !cpu_dai->driver->symmetric_rates &&
+           !rtd->dai_link->symmetric_rates)
+               return 0;
+
+       dev_dbg(&rtd->dev, "Symmetry forces %dHz rate\n", rtd->rate);
+
+       ret = snd_pcm_hw_constraint_minmax(substream->runtime,
+                                          SNDRV_PCM_HW_PARAM_RATE,
+                                          rtd->rate, rtd->rate);
+       if (ret < 0) {
+               dev_err(&rtd->dev,
+                       "Unable to apply rate symmetry constraint: %d\n", ret);
+               return ret;
        }
 
        return 0;