ASoC: wm8993: Refactor set_pll code to avoid GCC warnings
Subsystems (3)
PATCH 1/1 ASoC: wm8993: Refactor set_pll code to avoid GCC warnings
From: Fabio Estevam <[email protected]>
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 Fabio Estevam <[email protected]>
--- sound/soc/codecs/wm8983.c | 41 ++++++++++++++++++++++------------------- 1 file changed, 22 insertions(+), 19 deletions(-)
sound/soc/codecs/wm8983.c +22 -19
@@ -851,30 +851,33 @@ 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 before re-programming it */ +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 ; +/* disable the PLL before re-programming it */ +snd_soc_update_bits (codec,WM8983_POWER_MANAGEMENT_1 , +WM8983_PLLEN_MASK ,0 ); + +/* set PLLN and PRESCALE */ +snd_soc_write (codec,WM8983_PLL_N , + (pll_div.div2 <<WM8983_PLL_PRESCALE_SHIFT ) + | pll_div.n); +/* set PLLK */ +snd_soc_write (codec,WM8983_PLL_K_3 , pll_div.k &0x1ff ); +snd_soc_write (codec,WM8983_PLL_K_2 , (pll_div.k >>9 ) &0x1ff ); +snd_soc_write (codec,WM8983_PLL_K_1 , (pll_div.k >>18 )); +/* enable the PLL */ +snd_soc_update_bits (codec,WM8983_POWER_MANAGEMENT_1 , +WM8983_PLLEN_MASK ,WM8983_PLLEN ); + } -/* set PLLN and PRESCALE */ -snd_soc_write (codec,WM8983_PLL_N , - (pll_div.div2 <<WM8983_PLL_PRESCALE_SHIFT ) - | pll_div.n); -/* set PLLK */ -snd_soc_write (codec,WM8983_PLL_K_3 , pll_div.k &0x1ff ); -snd_soc_write (codec,WM8983_PLL_K_2 , (pll_div.k >>9 ) &0x1ff ); -snd_soc_write (codec,WM8983_PLL_K_1 , (pll_div.k >>18 )); -/* enable the PLL */ -snd_soc_update_bits (codec,WM8983_POWER_MANAGEMENT_1 , -WM8983_PLLEN_MASK ,WM8983_PLLEN );return 0 ; }
Signature · 1 line
1.7.9.5
sound/soc/codecs/wm8983.c static int wm8983_set_pll(struct snd_soc_dai *dai, int pll_id, · line 858
Quoted 6 lines · Fabio Estevam
sound/soc/codecs/wm8983.c +5
-1-if (freq_in && freq_out) { +if (!freq_in || !freq_out) { +/* disable the PLL before re-programming it */ +snd_soc_update_bits (codec,WM8983_POWER_MANAGEMENT_1 , +WM8983_PLLEN_MASK ,0 ); +return 0 ;
This comment clearly doesn't match the code.