]> git.karo-electronics.de Git - linux-beck.git/commitdiff
ASoC: samsung: i2s: Remove an unneeded goto usage
authorSylwester Nawrocki <s.nawrocki@samsung.com>
Wed, 14 Jan 2015 18:42:34 +0000 (19:42 +0100)
committerMark Brown <broonie@kernel.org>
Wed, 14 Jan 2015 19:46:54 +0000 (19:46 +0000)
The usage of this goto seems unjustified, use if/else statement instead.

Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/samsung/i2s.c

index cab2a2abc89b40254e4f09bd5515d563c5625646..2bac71945b3e563284a86b77e107ab2d61bc7cf3 100644 (file)
@@ -979,19 +979,18 @@ static int samsung_i2s_dai_probe(struct snd_soc_dai *dai)
        if (is_secondary(i2s)) { /* If this is probe on the secondary DAI */
                samsung_asoc_init_dma_data(dai, &other->sec_dai->dma_playback,
                                           NULL);
-               goto probe_exit;
-       }
-
-       samsung_asoc_init_dma_data(dai, &i2s->dma_playback, &i2s->dma_capture);
+       } else {
+               samsung_asoc_init_dma_data(dai, &i2s->dma_playback,
+                                          &i2s->dma_capture);
 
-       if (i2s->quirks & QUIRK_NEED_RSTCLR)
-               writel(CON_RSTCLR, i2s->addr + I2SCON);
+               if (i2s->quirks & QUIRK_NEED_RSTCLR)
+                       writel(CON_RSTCLR, i2s->addr + I2SCON);
 
-       if (i2s->quirks & QUIRK_SUPPORTS_IDMA)
-               idma_reg_addr_init(i2s->addr,
+               if (i2s->quirks & QUIRK_SUPPORTS_IDMA)
+                       idma_reg_addr_init(i2s->addr,
                                        i2s->sec_dai->idma_playback.dma_addr);
+       }
 
-probe_exit:
        /* Reset any constraint on RFS and BFS */
        i2s->rfs = 0;
        i2s->bfs = 0;