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

Commit 86ce6c9a authored by Dimitris Papastamos's avatar Dimitris Papastamos Committed by Mark Brown
Browse files

ASoC: WM8804: Refactor set_pll code to avoid GCC warnings 



Ensure that no uninitialised variable warnings are generated by
GCC.

Signed-off-by: default avatarDimitris Papastamos <dp@opensource.wolfsonmicro.com>
Acked-by: default avatarLiam Girdwood <lrg@slimlogic.co.uk>
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent cb13c6b3

sound/soc/codecs/wm8804.c

+26 −21
Original line number Diff line number Diff line
@@ -390,16 +390,20 @@ static int wm8804_set_pll(struct snd_soc_dai *dai, int pll_id, 
			  int source, unsigned int freq_in,

			  unsigned int freq_out)

{

	int ret;

	struct snd_soc_codec *codec;

	struct pll_div pll_div = { 0 };



	codec = dai->codec;

	if (freq_in && freq_out) {

	if (!freq_in || !freq_out) {

		/* disable the PLL */

		snd_soc_update_bits(codec, WM8804_PWRDN, 0x1, 0);

		return 0;

	} else {

		int ret;

		struct pll_div pll_div;



		ret = pll_factors(&pll_div, freq_out, freq_in);

		if (ret)

			return ret;

	}



		/* power down the PLL before reprogramming it */

		snd_soc_update_bits(codec, WM8804_PWRDN, 0x1, 0);
@@ -420,6 +424,7 @@ static int wm8804_set_pll(struct snd_soc_dai *dai, int pll_id, 


		/* power up the PLL */

		snd_soc_update_bits(codec, WM8804_PWRDN, 0x1, 0x1);

	}



	return 0;

}