2021-12-07 11:01:05

by Anders Roxell

Subject: [PATCH] sound: ppc: beep: fix clang -Wimplicit-fallthrough

Clang warns:

sound/ppc/beep.c:103:2: warning: unannotated fall-through between switch labels [-Wimplicit-fallthrough]
case SND_TONE: break;
^
sound/ppc/beep.c:103:2: note: insert 'break;' to avoid fall-through
case SND_TONE: break;
^
break;
1 warning generated.

Clang is more pedantic than GCC, which does not warn when failing
through to a case that is just break or return. Clang's version
is more in line with the kernel's own stance in deprecated.rst.
Add athe missing break to silence the warning.

Reported-by: Naresh Kamboju <[email protected]>
Signed-off-by: Anders Roxell <[email protected]>
---
sound/ppc/beep.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sound/ppc/beep.c b/sound/ppc/beep.c
index 0f4bce1c0d4f..bf289783eafd 100644
--- a/sound/ppc/beep.c
+++ b/sound/ppc/beep.c
@@ -99,7 +99,7 @@ static int snd_pmac_beep_event(struct input_dev *dev, unsigned int type,
return -1;

switch (code) {
- case SND_BELL: if (hz) hz = 1000;
+ case SND_BELL: if (hz) hz = 1000; break;
case SND_TONE: break;
default: return -1;
}
--
2.33.0

2021-12-07 14:37:26

by Takashi Iwai

Subject: Re: [PATCH] sound: ppc: beep: fix clang -Wimplicit-fallthrough

On Tue, 07 Dec 2021 12:00:53 +0100,
Anders Roxell wrote:
>
> Clang warns:
>
> sound/ppc/beep.c:103:2: warning: unannotated fall-through between switch labels [-Wimplicit-fallthrough]
> case SND_TONE: break;
> ^
> sound/ppc/beep.c:103:2: note: insert 'break;' to avoid fall-through
> case SND_TONE: break;
> ^
> break;
> 1 warning generated.
>
> Clang is more pedantic than GCC, which does not warn when failing
> through to a case that is just break or return. Clang's version
> is more in line with the kernel's own stance in deprecated.rst.
> Add athe missing break to silence the warning.
>
> Reported-by: Naresh Kamboju <[email protected]>
> Signed-off-by: Anders Roxell <[email protected]>

Thanks, applied.


Takashi