ASoC: adav80x: mark expected switch fall-through
Subsystems (3)
PATCH 1/1 ASoC: adav80x: mark expected switch fall-through
In preparation to enabling -Wimplicit-fallthrough, mark switch cases where we are expecting to fall through.
Addresses-Coverity-ID: 1056531 ("Missing break in switch")
--- sound/soc/codecs/adav80x.c | 1 + 1 file changed, 1 insertion(+)
sound/soc/codecs/adav80x.c +1 -0
@@ -648,6 +648,7 @@ static int adav80x_set_pll(struct snd_soc_component *component, int pll_id, pll_ctrl1 |=ADAV80X_PLL_CTRL1_PLLDIV ;break ; } +/* fall through */ default :return -EINVAL ; }
Signature · 1 line
2.7.4
Mark Brown
maintainersound/soc/codecs/adav80x.c static int adav80x_set_pll(struct snd_soc_component *component, int pll_id, · line 654
Quoted 8 lines · Gustavo A. R. Silva
sound/soc/codecs/adav80x.c +1
-0@@ -648,6 +648,7 @@ static int adav80x_set_pll(struct snd_soc_component *component, int pll_id, pll_ctrl1 |=ADAV80X_PLL_CTRL1_PLLDIV ;break ; } +/* fall through */ default :return -EINVAL ; }
Are you *positive* this is a deliberate fall through?
Quoted 12 lines · Mark Brown
sound/soc/codecs/adav80x.c static int adav80x_set_pll(struct snd_soc_component *component, int pll_id, · line 654
Quoted 8 lines · Gustavo A. R. Silva
sound/soc/codecs/adav80x.c +1
-0@@ -648,6 +648,7 @@ static int adav80x_set_pll(struct snd_soc_component *component, int pll_id, pll_ctrl1 |=ADAV80X_PLL_CTRL1_PLLDIV ;break ; } +/* fall through */ default :return -EINVAL ; }Are you *positive* this is a deliberate fall through?
It is. But it might make sense to re-order the code to look like
case 54000000:
if (source != ADAV80X_PLL_SRC_XIN)
return -EINVAL;
pll_ctrl1 |= ADAV80X_PLL_CTRL1_PLLDIV;
break;It is just as many lines added when adding the /* fall through */, but it makes it more obvious what is going on.
Either way:
Mark Brown
maintainerQuoted 11 lines · Lars-Peter Clausen
On 08/09/2018 11:30 AM, Mark Brown wrote:
It is. But it might make sense to re-order the code to look like
case 54000000: if (source != ADAV80X_PLL_SRC_XIN) return -EINVAL; pll_ctrl1 |= ADAV80X_PLL_CTRL1_PLLDIV; break;
Quoted 2 lines
It is just as many lines added when adding the /* fall through */, but it makes it more obvious what is going on.
Yes, it's much more obvious.
Mark Brown
maintainerApplied "ASoC: adav80x: mark expected switch fall-through" to the asoc tree
In reply to Gustavo A. R. SilvaThe patch
ASoC: adav80x: mark expected switch fall-through
has been applied to the asoc tree at
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git
All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying to this mail.
Thanks,
Mark
Quoted 1 line
From
f2cf0ef7c0ce141bb38f315c34c56e6ef5667a27Mon Sep 17 00:00:00 2001
From: "Gustavo A. R. Silva" <[email protected]>
Date: Wed, 8 Aug 2018 14:19:33 -0500
Subject: [PATCH] ASoC: adav80x: mark expected switch fall-through
In preparation to enabling -Wimplicit-fallthrough, mark switch cases where we are expecting to fall through.
Addresses-Coverity-ID: 1056531 ("Missing break in switch")
--- sound/soc/codecs/adav80x.c | 1 + 1 file changed, 1 insertion(+)
sound/soc/codecs/adav80x.c +1 -0
@@ -648,6 +648,7 @@ static int adav80x_set_pll(struct snd_soc_component *component, int pll_id, pll_ctrl1 |=ADAV80X_PLL_CTRL1_PLLDIV ;break ; } +/* fall through */ default :return -EINVAL ; }
Signature · 1 line
2.18.0