aboutsummaryrefslogtreecommitdiffstats
path: root/sound/soc/codecs/da7210.c
diff options
context:
space:
mode:
authorAshish Chavan <ashish.chavan@kpitcummins.com>2012-04-17 11:37:44 -0400
committerMark Brown <broonie@opensource.wolfsonmicro.com>2012-04-17 15:52:42 -0400
commitc4b14e70a1e59caff00d8336430704376b4211ed (patch)
tree172c59099cd4e8a2a8331a5a56b959cffc939e7d /sound/soc/codecs/da7210.c
parent570aa7bae5e72900d62915fc56783689d95c3fb3 (diff)
ASoC: da7210: Minor update for PLL and SRM
This patch converts multiple if conditions in to single if with "&&"s. Signed-off-by: Ashish Chavan <ashish.chavan@kpitcummins.com> Signed-off-by: David Dajun Chen <dchen@diasemi.com> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound/soc/codecs/da7210.c')
-rw-r--r--sound/soc/codecs/da7210.c22
1 files changed, 9 insertions, 13 deletions
diff --git a/sound/soc/codecs/da7210.c b/sound/soc/codecs/da7210.c
index 65e666e630d7..f92d1f777757 100644
--- a/sound/soc/codecs/da7210.c
+++ b/sound/soc/codecs/da7210.c
@@ -992,19 +992,15 @@ static int da7210_set_dai_pll(struct snd_soc_dai *codec_dai, int pll_id,
992 992
993 /* Search pll div array for correct divisors */ 993 /* Search pll div array for correct divisors */
994 for (cnt = 0; cnt < ARRAY_SIZE(da7210_pll_div); cnt++) { 994 for (cnt = 0; cnt < ARRAY_SIZE(da7210_pll_div); cnt++) {
995 /* check fref */ 995 /* check fref, mode and fout */
996 if (fref == da7210_pll_div[cnt].fref) { 996 if ((fref == da7210_pll_div[cnt].fref) &&
997 /* check mode */ 997 (da7210->master == da7210_pll_div[cnt].mode) &&
998 if (da7210->master == da7210_pll_div[cnt].mode) { 998 (fout == da7210_pll_div[cnt].fout)) {
999 /* check fout */ 999 /* all match, pick up divisors */
1000 if (fout == da7210_pll_div[cnt].fout) { 1000 pll_div1 = da7210_pll_div[cnt].div1;
1001 /* all match, pick up divisors */ 1001 pll_div2 = da7210_pll_div[cnt].div2;
1002 pll_div1 = da7210_pll_div[cnt].div1; 1002 pll_div3 = da7210_pll_div[cnt].div3;
1003 pll_div2 = da7210_pll_div[cnt].div2; 1003 break;
1004 pll_div3 = da7210_pll_div[cnt].div3;
1005 break;
1006 }
1007 }
1008 } 1004 }
1009 } 1005 }
1010 if (cnt >= ARRAY_SIZE(da7210_pll_div)) 1006 if (cnt >= ARRAY_SIZE(da7210_pll_div))