ASoC: codec: wm9860: avoid maybe-uninitialized warning

The new PLL configuration code triggers a harmless warning:

sound/soc/codecs/wm8960.c: In function 'wm8960_configure_clocking':
sound/soc/codecs/wm8960.c:735:3: error: 'best_freq_out' may be used
uninitialized in this function [-Werror=maybe-uninitialized]
   wm8960_set_pll(codec, freq_in, best_freq_out);
   ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
sound/soc/codecs/wm8960.c:699:12: note: 'best_freq_out' was declared
here

Fix this by reworking the code such that:

1) When there is no PLL freq available return -EINVAL and make
sure *bclk_idx, *dac_idx, *sysclk_idx are initialized with
invalid values.

2) When there is a PLL freq available initialize *bclk_idx,
*dac_idx and *sysclk_idx with correct values and immediately
return the freq available.

Fixes: 84fdc00d519f ("ASoC: codec: wm9860: Refactor PLL out freq search")
Fixes: 303e8954af8d ("ASoC: codec: wm8960: Stop when a matching PLL freq is found")
Suggested-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Daniel Baluta <daniel.baluta@nxp.com>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/codecs/wm8960.c b/sound/soc/codecs/wm8960.c
index ace69da97cb80942868efe91b44f3ef29ca55e9c..d899623fb1010bd56db3a0d35af2678e75f5753a 100644 (file)
--- a/sound/soc/codecs/wm8960.c
+++ b/sound/soc/codecs/wm8960.c
@@ -686,7 +686,7 @@ int wm8960_configure_sysclk(struct wm8960_priv *wm8960, int mclk,
  * @bclk_idx: bclk_divs index for found bclk
  *
  * Returns:
- *  -1, in case no PLL frequency out available was found
+ * < 0, in case no PLL frequency out available was found
  * >=0, in case we could derive bclk, lrclk, sysclk from PLL out using
  *      (@sysclk_idx, @dac_idx, @bclk_idx) dividers
  */
@@ -696,13 +696,13 @@ int wm8960_configure_pll(struct snd_soc_codec *codec, int freq_in,
 {
        struct wm8960_priv *wm8960 = snd_soc_codec_get_drvdata(codec);
        int sysclk, bclk, lrclk, freq_out;
-       int diff, best_freq_out;
+       int diff;
        int i, j, k;
 
        bclk = wm8960->bclk;
        lrclk = wm8960->lrclk;
 
-       *bclk_idx = -1;
+       *sysclk_idx = *dac_idx = *bclk_idx = -1;
 
        for (i = 0; i < ARRAY_SIZE(sysclk_divs); ++i) {
                if (sysclk_divs[i] == -1)
@@ -720,21 +720,12 @@ int wm8960_configure_pll(struct snd_soc_codec *codec, int freq_in,
                                        *sysclk_idx = i;
                                        *dac_idx = j;
                                        *bclk_idx = k;
-                                       best_freq_out = freq_out;
-                                       break;
+                                       return freq_out;
                                }
                        }
-                       if (k != ARRAY_SIZE(bclk_divs))
-                               break;
                }
-               if (j != ARRAY_SIZE(dac_divs))
-                       break;
        }
-
-       if (*bclk_idx != -1)
-               wm8960_set_pll(codec, freq_in, best_freq_out);
-
-       return *bclk_idx;
+       return -EINVAL;
 }
 static int wm8960_configure_clocking(struct snd_soc_codec *codec)
 {
@@ -783,11 +774,12 @@ static int wm8960_configure_clocking(struct snd_soc_codec *codec)
                }
        }
 
-       ret = wm8960_configure_pll(codec, freq_in, &i, &j, &k);
-       if (ret < 0) {
+       freq_out = wm8960_configure_pll(codec, freq_in, &i, &j, &k);
+       if (freq_out < 0) {
                dev_err(codec->dev, "failed to configure clock via PLL\n");
-               return -EINVAL;
+               return freq_out;
        }
+       wm8960_set_pll(codec, freq_in, freq_out);
 
 configure_clock:
        /* configure sysclk clock */