Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 872c26bd authored by Sylwester Nawrocki's avatar Sylwester Nawrocki Committed by Mark Brown
Browse files

ASoC: samsung: i2s: Remove an unneeded goto usage 



The usage of this goto seems unjustified, use if/else statement instead.

Signed-off-by: default avatarSylwester Nawrocki <s.nawrocki@samsung.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent dcd60fc3

sound/soc/samsung/i2s.c

+8 −9
Original line number Original line Diff line number Diff line
@@ -979,10 +979,9 @@ static int samsung_i2s_dai_probe(struct snd_soc_dai *dai) 
	if (is_secondary(i2s)) { /* If this is probe on the secondary DAI */

	if (is_secondary(i2s)) { /* If this is probe on the secondary DAI */

		samsung_asoc_init_dma_data(dai, &other->sec_dai->dma_playback,

		samsung_asoc_init_dma_data(dai, &other->sec_dai->dma_playback,

					   NULL);

					   NULL);

		goto probe_exit;

	} else {

	}

		samsung_asoc_init_dma_data(dai, &i2s->dma_playback,



					   &i2s->dma_capture);

	samsung_asoc_init_dma_data(dai, &i2s->dma_playback, &i2s->dma_capture);





		if (i2s->quirks & QUIRK_NEED_RSTCLR)

		if (i2s->quirks & QUIRK_NEED_RSTCLR)

			writel(CON_RSTCLR, i2s->addr + I2SCON);

			writel(CON_RSTCLR, i2s->addr + I2SCON);
@@ -990,8 +989,8 @@ static int samsung_i2s_dai_probe(struct snd_soc_dai *dai) 
		if (i2s->quirks & QUIRK_SUPPORTS_IDMA)

		if (i2s->quirks & QUIRK_SUPPORTS_IDMA)

			idma_reg_addr_init(i2s->addr,

			idma_reg_addr_init(i2s->addr,

					i2s->sec_dai->idma_playback.dma_addr);

					i2s->sec_dai->idma_playback.dma_addr);

	}





probe_exit:

	/* Reset any constraint on RFS and BFS */

	/* Reset any constraint on RFS and BFS */

	i2s->rfs = 0;

	i2s->rfs = 0;

	i2s->bfs = 0;

	i2s->bfs = 0;