Skip to contentSkip to conversation

ASoC: da7210: Minor update for PLL and SRM

PATCH Applied Ashish Chavan 2 participants 2 messages Apr 17, 2012

Subsystems (3)
Sound ASoC Dialog semiconductor drivers
lore
Share & tools
lore

Ashish Chavan

author
#0 lore raw

PATCH v2 1/1 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 <[email protected]>
Signed-off-by David Dajun Chen <[email protected]>

---
Changes since v1:
Aligned '(' s for the branches

---
 sound/soc/codecs/da7210.c |   22 +++++++++-------------
 1 files changed, 9 insertions(+), 13 deletions(-)
sound/soc/codecs/da7210.c +9 -13
index cf4063b..d5fdf17 100644
@@ -992,19 +992,15 @@ static int da7210_set_dai_pll(struct snd_soc_dai *codec_dai, int pll_id,
 
 	/* Search pll div array for correct divisors */
 	for (cnt = 0; cnt < ARRAY_SIZE(da7210_pll_div); cnt++) {
-		/* check fref */
-		if (fref == da7210_pll_div[cnt].fref) {
-			/* check mode */
-			 if (da7210->master ==  da7210_pll_div[cnt].mode) {
-				/* check fout */
-				if (fout == da7210_pll_div[cnt].fout) {
-					/* all match, pick up divisors */
-					pll_div1 = da7210_pll_div[cnt].div1;
-					pll_div2 = da7210_pll_div[cnt].div2;
-					pll_div3 = da7210_pll_div[cnt].div3;
-					break;
-				}
-			}
+		/* check fref, mode  and fout */
+		if ((fref == da7210_pll_div[cnt].fref) &&
+		    (da7210->master ==  da7210_pll_div[cnt].mode) &&
+		    (fout == da7210_pll_div[cnt].fout)) {
+			/* all match, pick up divisors */
+			pll_div1 = da7210_pll_div[cnt].div1;
+			pll_div2 = da7210_pll_div[cnt].div2;
+			pll_div3 = da7210_pll_div[cnt].div3;
+			break;
 		}
 	}
 	if (cnt >= ARRAY_SIZE(da7210_pll_div))
Signature · 1 line
1.7.1
Applied
#1 lore raw
Quoted 1 line · Ashish Chavan

This patch converts multiple if conditions in to single if with "&&"s.

Applied, thanks.