ASoC: ad1980: Replace goto loop with do-while loop (cf7b71f4) · Commits · 戴 / test

Using a proper do-while loop here instead of a open-coded goto loop is both cleaner and shorter. Also fixes the following warnings from smatch: sound/soc/codecs/ad1980.c:213 ad1980_reset() info: loop could be replaced with if statement. sound/soc/codecs/ad1980.c:212 ad1980_reset() info: ignoring unreachable code. sound/soc/codecs/ad1980.c:215 ad1980_reset() info: ignoring unreachable code. While we are at it also change retry_cnt to unsigned int, using u16 for a on-stack loop counter doesn't make that much sense. Signed-off-by:

Lars-Peter Clausen <lars@metafoo.de> Signed-off-by:

Mark Brown <broonie@linaro.org>

sound/soc/codecs/ad1980.c

+19 −20

Original line number	Diff line number	Diff line
		@@ -189,9 +189,9 @@ static struct snd_soc_dai_driver ad1980_dai = {

		static int ad1980_reset(struct snd_soc_codec *codec, int try_warm)
		{
		u16 retry_cnt = 0;
		unsigned int retry_cnt = 0;

		retry:
		do {
		if (try_warm && soc_ac97_ops->warm_reset) {
		soc_ac97_ops->warm_reset(codec->ac97);
		if (ac97_read(codec, AC97_RESET) == 0x0090)
		@@ -199,18 +199,17 @@ retry:
		}

		soc_ac97_ops->reset(codec->ac97);
		/* Set bit 16slot in register 74h, then every slot will has only 16
		* bits. This command is sent out in 20bit mode, in which case the
		* first nibble of data is eaten by the addr. (Tag is always 16 bit)*/
		/*
		* Set bit 16slot in register 74h, then every slot will has only
		* 16 bits. This command is sent out in 20bit mode, in which
		* case the first nibble of data is eaten by the addr. (Tag is
		* always 16 bit)
		*/
		ac97_write(codec, AC97_AD_SERIAL_CFG, 0x9900);

		if (ac97_read(codec, AC97_RESET) != 0x0090)
		goto err;
		if (ac97_read(codec, AC97_RESET) == 0x0090)
		return 0;

		err:
		while (retry_cnt++ < 10)
		goto retry;
		} while (retry_cnt++ < 10);

		printk(KERN_ERR "AD1980 AC97 reset failed\n");
		return -EIO;

Admin message