* [PATCH] ASoC: WM8804: Refactor set_pll code to avoid GCC warnings
@ 2010-10-04 8:31 Dimitris Papastamos
2010-10-04 10:10 ` Liam Girdwood
2010-10-04 15:03 ` Mark Brown
0 siblings, 2 replies; 3+ messages in thread
From: Dimitris Papastamos @ 2010-10-04 8:31 UTC (permalink / raw)
To: Mark Brown, Liam Girdwood; +Cc: alsa-devel, patches
Ensure that no uninitialised variable warnings are generated by
GCC.
Signed-off-by: Dimitris Papastamos <dp@opensource.wolfsonmicro.com>
---
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 40e5067..b23c57c 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;
}
--
1.7.3.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] ASoC: WM8804: Refactor set_pll code to avoid GCC warnings
2010-10-04 8:31 [PATCH] ASoC: WM8804: Refactor set_pll code to avoid GCC warnings Dimitris Papastamos
@ 2010-10-04 10:10 ` Liam Girdwood
2010-10-04 15:03 ` Mark Brown
1 sibling, 0 replies; 3+ messages in thread
From: Liam Girdwood @ 2010-10-04 10:10 UTC (permalink / raw)
To: Dimitris Papastamos; +Cc: alsa-devel, Mark Brown, patches
On Mon, 2010-10-04 at 09:31 +0100, Dimitris Papastamos wrote:
> 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>
--
Freelance Developer, SlimLogic Ltd
ASoC and Voltage Regulator Maintainer.
http://www.slimlogic.co.uk
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] ASoC: WM8804: Refactor set_pll code to avoid GCC warnings
2010-10-04 8:31 [PATCH] ASoC: WM8804: Refactor set_pll code to avoid GCC warnings Dimitris Papastamos
2010-10-04 10:10 ` Liam Girdwood
@ 2010-10-04 15:03 ` Mark Brown
1 sibling, 0 replies; 3+ messages in thread
From: Mark Brown @ 2010-10-04 15:03 UTC (permalink / raw)
To: Dimitris Papastamos; +Cc: alsa-devel, patches, Liam Girdwood
On Mon, Oct 04, 2010 at 09:31:42AM +0100, Dimitris Papastamos wrote:
> Ensure that no uninitialised variable warnings are generated by
> GCC.
>
> Signed-off-by: Dimitris Papastamos <dp@opensource.wolfsonmicro.com>
Applied, thanks.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2010-10-04 15:03 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-10-04 8:31 [PATCH] ASoC: WM8804: Refactor set_pll code to avoid GCC warnings Dimitris Papastamos
2010-10-04 10:10 ` Liam Girdwood
2010-10-04 15:03 ` Mark Brown
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).