2019-07-30 09:01:38

by Gustavo A. R. Silva

[permalink] [raw]
Subject: [PATCH] ASoC: ti: Mark expected switch fall-throughs

Mark switch cases where we are expecting to fall through.

This patch fixes the following warning (Building: arm):

sound/soc/ti/n810.c: In function ‘n810_ext_control’:
sound/soc/ti/n810.c:48:10: warning: this statement may fall through [-Wimplicit-fallthrough=]
line1l = 1;
~~~~~~~^~~
sound/soc/ti/n810.c:49:2: note: here
case N810_JACK_HP:
^~~~

sound/soc/ti/rx51.c: In function ‘rx51_ext_control’:
sound/soc/ti/rx51.c:57:6: warning: this statement may fall through [-Wimplicit-fallthrough=]
hs = 1;
~~~^~~
sound/soc/ti/rx51.c:58:2: note: here
case RX51_JACK_HP:
^~~~

Signed-off-by: Gustavo A. R. Silva <[email protected]>
---
sound/soc/ti/n810.c | 1 +
sound/soc/ti/rx51.c | 1 +
2 files changed, 2 insertions(+)

diff --git a/sound/soc/ti/n810.c b/sound/soc/ti/n810.c
index 2c3f2a4c1700..3ad2b6daf31e 100644
--- a/sound/soc/ti/n810.c
+++ b/sound/soc/ti/n810.c
@@ -46,6 +46,7 @@ static void n810_ext_control(struct snd_soc_dapm_context *dapm)
switch (n810_jack_func) {
case N810_JACK_HS:
line1l = 1;
+ /* fall through */
case N810_JACK_HP:
hp = 1;
break;
diff --git a/sound/soc/ti/rx51.c b/sound/soc/ti/rx51.c
index bc6046534fa5..ccd0e8a07dd1 100644
--- a/sound/soc/ti/rx51.c
+++ b/sound/soc/ti/rx51.c
@@ -55,6 +55,7 @@ static void rx51_ext_control(struct snd_soc_dapm_context *dapm)
break;
case RX51_JACK_HS:
hs = 1;
+ /* fall through */
case RX51_JACK_HP:
hp = 1;
break;
--
2.22.0


2019-07-30 17:10:55

by Jarkko Nikula

[permalink] [raw]
Subject: Re: [PATCH] ASoC: ti: Mark expected switch fall-throughs

On Mon, Jul 29, 2019 at 05:15:34PM -0500, Gustavo A. R. Silva wrote:
> Mark switch cases where we are expecting to fall through.
>
> This patch fixes the following warning (Building: arm):
>
> sound/soc/ti/n810.c: In function ‘n810_ext_control’:
> sound/soc/ti/n810.c:48:10: warning: this statement may fall through [-Wimplicit-fallthrough=]
> line1l = 1;
> ~~~~~~~^~~
> sound/soc/ti/n810.c:49:2: note: here
> case N810_JACK_HP:
> ^~~~
>
> sound/soc/ti/rx51.c: In function ‘rx51_ext_control’:
> sound/soc/ti/rx51.c:57:6: warning: this statement may fall through [-Wimplicit-fallthrough=]
> hs = 1;
> ~~~^~~
> sound/soc/ti/rx51.c:58:2: note: here
> case RX51_JACK_HP:
> ^~~~
>
> Signed-off-by: Gustavo A. R. Silva <[email protected]>
> ---
> sound/soc/ti/n810.c | 1 +
> sound/soc/ti/rx51.c | 1 +
> 2 files changed, 2 insertions(+)
>
Acked-by: Jarkko Nikula <[email protected]>