| Message ID | 20181004183006.23983-2-tiwai@suse.de (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | ASoC: Fix fall-through annotations | expand |
On 10/04/2018 08:30 PM, Takashi Iwai wrote: > As a preparatory patch for the upcoming -Wimplicit-fallthrough > compiler checks, replace with the standard "fall through" annotation > at the right place. It has to be put right before the next label. > > Signed-off-by: Takashi Iwai <tiwai@suse.de> Looks good, but somebody else already sent the same awhile ago. I'm not sure, maybe it did not get picked up: https://patchwork.kernel.org/patch/10560465/? > --- > sound/soc/codecs/adau1761.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/sound/soc/codecs/adau1761.c b/sound/soc/codecs/adau1761.c > index be136e981653..bef3e9e74c26 100644 > --- a/sound/soc/codecs/adau1761.c > +++ b/sound/soc/codecs/adau1761.c > @@ -518,7 +518,8 @@ static int adau1761_setup_digmic_jackdetect(struct snd_soc_component *component) > ARRAY_SIZE(adau1761_jack_detect_controls)); > if (ret) > return ret; > - case ADAU1761_DIGMIC_JACKDET_PIN_MODE_NONE: /* fallthrough */ > + /* fall through */ > + case ADAU1761_DIGMIC_JACKDET_PIN_MODE_NONE: > ret = snd_soc_dapm_add_routes(dapm, adau1761_no_dmic_routes, > ARRAY_SIZE(adau1761_no_dmic_routes)); > if (ret) >
On Thu, 04 Oct 2018 20:34:20 +0200, Lars-Peter Clausen wrote: > > On 10/04/2018 08:30 PM, Takashi Iwai wrote: > > As a preparatory patch for the upcoming -Wimplicit-fallthrough > > compiler checks, replace with the standard "fall through" annotation > > at the right place. It has to be put right before the next label. > > > > Signed-off-by: Takashi Iwai <tiwai@suse.de> > > Looks good, but somebody else already sent the same awhile ago. I'm not > sure, maybe it did not get picked up: > https://patchwork.kernel.org/patch/10560465/? Yeah, seems to have slipped from Mark's hands. I don't mind which patch is taken, of course. thanks, Takashi > > > --- > > sound/soc/codecs/adau1761.c | 3 ++- > > 1 file changed, 2 insertions(+), 1 deletion(-) > > > > diff --git a/sound/soc/codecs/adau1761.c b/sound/soc/codecs/adau1761.c > > index be136e981653..bef3e9e74c26 100644 > > --- a/sound/soc/codecs/adau1761.c > > +++ b/sound/soc/codecs/adau1761.c > > @@ -518,7 +518,8 @@ static int adau1761_setup_digmic_jackdetect(struct snd_soc_component *component) > > ARRAY_SIZE(adau1761_jack_detect_controls)); > > if (ret) > > return ret; > > - case ADAU1761_DIGMIC_JACKDET_PIN_MODE_NONE: /* fallthrough */ > > + /* fall through */ > > + case ADAU1761_DIGMIC_JACKDET_PIN_MODE_NONE: > > ret = snd_soc_dapm_add_routes(dapm, adau1761_no_dmic_routes, > > ARRAY_SIZE(adau1761_no_dmic_routes)); > > if (ret) > > >
On Thu, Oct 04, 2018 at 08:39:11PM +0200, Takashi Iwai wrote: > Lars-Peter Clausen wrote: > > On 10/04/2018 08:30 PM, Takashi Iwai wrote: > > > As a preparatory patch for the upcoming -Wimplicit-fallthrough > > > compiler checks, replace with the standard "fall through" annotation > > > at the right place. It has to be put right before the next label. > > Looks good, but somebody else already sent the same awhile ago. I'm not > > sure, maybe it did not get picked up: > > https://patchwork.kernel.org/patch/10560465/? > Yeah, seems to have slipped from Mark's hands. > I don't mind which patch is taken, of course. IIRC I had a query about it as it was part of a series that had some oversights.
diff --git a/sound/soc/codecs/adau1761.c b/sound/soc/codecs/adau1761.c index be136e981653..bef3e9e74c26 100644 --- a/sound/soc/codecs/adau1761.c +++ b/sound/soc/codecs/adau1761.c @@ -518,7 +518,8 @@ static int adau1761_setup_digmic_jackdetect(struct snd_soc_component *component) ARRAY_SIZE(adau1761_jack_detect_controls)); if (ret) return ret; - case ADAU1761_DIGMIC_JACKDET_PIN_MODE_NONE: /* fallthrough */ + /* fall through */ + case ADAU1761_DIGMIC_JACKDET_PIN_MODE_NONE: ret = snd_soc_dapm_add_routes(dapm, adau1761_no_dmic_routes, ARRAY_SIZE(adau1761_no_dmic_routes)); if (ret)
As a preparatory patch for the upcoming -Wimplicit-fallthrough compiler checks, replace with the standard "fall through" annotation at the right place. It has to be put right before the next label. Signed-off-by: Takashi Iwai <tiwai@suse.de> --- sound/soc/codecs/adau1761.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)