diff options
| author | Dimitris Papastamos <dp@opensource.wolfsonmicro.com> | 2010-10-04 10:31:42 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-10-04 17:03:00 +0200 |
| commit | 86ce6c9a62c333157d3f2ef4e4dc1fe18b70eb63 (patch) | |
| tree | 3afb829ce65e7df0aec50a440671ce517cfb33e1 /sound/soc/codecs/wm8804.c | |
| parent | ASoC: WM8804: Use a proper DAI name (diff) | |
| download | linux-86ce6c9a62c333157d3f2ef4e4dc1fe18b70eb63.tar.xz linux-86ce6c9a62c333157d3f2ef4e4dc1fe18b70eb63.zip | |
ASoC: WM8804: Refactor set_pll code to avoid GCC warnings
Ensure that no uninitialised variable warnings are generated by
GCC.
Signed-off-by: Dimitris Papastamos <dp@opensource.wolfsonmicro.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound/soc/codecs/wm8804.c')
| -rw-r--r-- | sound/soc/codecs/wm8804.c | 47 |
1 files changed, 26 insertions, 21 deletions
diff --git a/sound/soc/codecs/wm8804.c b/sound/soc/codecs/wm8804.c index 40e5067e8246..b23c57ca7c26 100644 --- a/sound/soc/codecs/wm8804.c +++ b/sound/soc/codecs/wm8804.c @@ -390,36 +390,41 @@ 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); + /* power down the PLL before reprogramming it */ + snd_soc_update_bits(codec, WM8804_PWRDN, 0x1, 0); - if (!freq_in || !freq_out) - return 0; + if (!freq_in || !freq_out) + return 0; - /* set PLLN and PRESCALE */ - snd_soc_update_bits(codec, WM8804_PLL4, 0xf | 0x10, - pll_div.n | (pll_div.prescale << 4)); - /* set mclkdiv and freqmode */ - snd_soc_update_bits(codec, WM8804_PLL5, 0x3 | 0x8, - pll_div.freqmode | (pll_div.mclkdiv << 3)); - /* set PLLK */ - snd_soc_write(codec, WM8804_PLL1, pll_div.k & 0xff); - snd_soc_write(codec, WM8804_PLL2, (pll_div.k >> 8) & 0xff); - snd_soc_write(codec, WM8804_PLL3, pll_div.k >> 16); - - /* power up the PLL */ - snd_soc_update_bits(codec, WM8804_PWRDN, 0x1, 0x1); + /* set PLLN and PRESCALE */ + snd_soc_update_bits(codec, WM8804_PLL4, 0xf | 0x10, + pll_div.n | (pll_div.prescale << 4)); + /* set mclkdiv and freqmode */ + snd_soc_update_bits(codec, WM8804_PLL5, 0x3 | 0x8, + pll_div.freqmode | (pll_div.mclkdiv << 3)); + /* set PLLK */ + snd_soc_write(codec, WM8804_PLL1, pll_div.k & 0xff); + snd_soc_write(codec, WM8804_PLL2, (pll_div.k >> 8) & 0xff); + snd_soc_write(codec, WM8804_PLL3, pll_div.k >> 16); + + /* power up the PLL */ + snd_soc_update_bits(codec, WM8804_PWRDN, 0x1, 0x1); + } return 0; } |