Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6757d8cc authored by Fabio Estevam's avatar Fabio Estevam Committed by Mark Brown
Browse files

ASoC: wm8993: Refactor set_pll code to avoid GCC warnings 



Refactor set_pll code to avoid the following warnings:

sound/soc/codecs/wm8983.c:873:40: warning: 'pll_div.k' may be used uninitialized in this function [-Wuninitialized]
sound/soc/codecs/wm8983.c:870:9: warning: 'pll_div.n' may be used uninitialized in this function [-Wuninitialized]
sound/soc/codecs/wm8983.c:869:23: warning: 'pll_div.div2' may be used uninitialized in this function [-Wuninitialized]

Do the same as in commit 86ce6c9a (ASoC: WM8804: Refactor set_pll code to avoid
GCC warnings).

Signed-off-by: default avatarFabio Estevam <fabio.estevam@freescale.com>
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent a49f0d1e

sound/soc/codecs/wm8983.c

+22 −19
Original line number Diff line number Diff line
@@ -851,19 +851,20 @@ static int wm8983_set_pll(struct snd_soc_dai *dai, int pll_id, 
	struct pll_div pll_div;



	codec = dai->codec;

	if (freq_in && freq_out) {

	if (!freq_in || !freq_out) {

		/* disable the PLL */

		snd_soc_update_bits(codec, WM8983_POWER_MANAGEMENT_1,

				    WM8983_PLLEN_MASK, 0);

		return 0;

	} else {

		ret = pll_factors(&pll_div, freq_out * 4 * 2, freq_in);

		if (ret)

			return ret;

	}



		/* disable the PLL before re-programming it */

		snd_soc_update_bits(codec, WM8983_POWER_MANAGEMENT_1,

				    WM8983_PLLEN_MASK, 0);



	if (!freq_in || !freq_out)

		return 0;



		/* set PLLN and PRESCALE */

		snd_soc_write(codec, WM8983_PLL_N,

			(pll_div.div2 << WM8983_PLL_PRESCALE_SHIFT)
@@ -875,6 +876,8 @@ static int wm8983_set_pll(struct snd_soc_dai *dai, int pll_id, 
		/* enable the PLL */

		snd_soc_update_bits(codec, WM8983_POWER_MANAGEMENT_1,

					WM8983_PLLEN_MASK, WM8983_PLLEN);

	}



	return 0;

}