| Message ID | 1588416384-18200-1-git-send-email-chenhc@lemote.com (mailing list archive) |
|---|---|
| State | Mainlined |
| Commit | 7cc8f2d5aca162f4e2ea07e53d3123f30a7b2582 |
| Headers | show |
| Series | [V2] MIPS: perf: Remove unnecessary "fallthrough" pseudo keywords | expand |
On Sat, May 02, 2020 at 06:46:24PM +0800, Huacai Chen wrote: > The last branch of switch-case doesn't need a "fallthrough" pseudo > keyword, and it will cause errors when building a kernel with -Werror: > > arch/mips/kernel/perf_event_mipsxx.c: In function 'reset_counters': > include/linux/compiler_attributes.h:200:41: error: attribute 'fallthrough' not preceding a case label or default label [-Werror] > 200 | # define fallthrough __attribute__((__fallthrough__)) > | ^~~~~~~~~~~~~ > >> arch/mips/kernel/perf_event_mipsxx.c:932:3: note: in expansion of macro 'fallthrough' > 932 | fallthrough; > | ^~~~~~~~~~~ > arch/mips/kernel/perf_event_mipsxx.c: In function 'loongson3_reset_counters': > include/linux/compiler_attributes.h:200:41: error: attribute 'fallthrough' not preceding a case label or default label [-Werror] > 200 | # define fallthrough __attribute__((__fallthrough__)) > | ^~~~~~~~~~~~~ > arch/mips/kernel/perf_event_mipsxx.c:903:3: note: in expansion of macro 'fallthrough' > 903 | fallthrough; > | ^~~~~~~~~~~ > cc1: all warnings being treated as errors > > Fix it by removing unnecessary "fallthrough" pseudo keywords. > > Fixes: e9dfbaaeef1c9fe ("MIPS: perf: Add hardware perf events support for new Loongson-3") > Reported-by: kbuild test robot <lkp@intel.com> > Signed-off-by: Huacai Chen <chenhc@lemote.com> > --- > arch/mips/kernel/perf_event_mipsxx.c | 2 -- > 1 file changed, 2 deletions(-) applied to mips-next. Thomas.
diff --git a/arch/mips/kernel/perf_event_mipsxx.c b/arch/mips/kernel/perf_event_mipsxx.c index a14974c..710b2c7 100644 --- a/arch/mips/kernel/perf_event_mipsxx.c +++ b/arch/mips/kernel/perf_event_mipsxx.c @@ -900,7 +900,7 @@ static void loongson3_reset_counters(void *arg) mipspmu.write_counter(0, 0); mipsxx_pmu_write_control(0, 575<<5); mipspmu.write_counter(0, 0); - fallthrough; + break; } } @@ -929,7 +928,7 @@ static void reset_counters(void *arg) case 1: mipsxx_pmu_write_control(0, 0); mipspmu.write_counter(0, 0); - fallthrough; + break; } }
The last branch of switch-case doesn't need a "fallthrough" pseudo keyword, and it will cause errors when building a kernel with -Werror: arch/mips/kernel/perf_event_mipsxx.c: In function 'reset_counters': include/linux/compiler_attributes.h:200:41: error: attribute 'fallthrough' not preceding a case label or default label [-Werror] 200 | # define fallthrough __attribute__((__fallthrough__)) | ^~~~~~~~~~~~~ >> arch/mips/kernel/perf_event_mipsxx.c:932:3: note: in expansion of macro 'fallthrough' 932 | fallthrough; | ^~~~~~~~~~~ arch/mips/kernel/perf_event_mipsxx.c: In function 'loongson3_reset_counters': include/linux/compiler_attributes.h:200:41: error: attribute 'fallthrough' not preceding a case label or default label [-Werror] 200 | # define fallthrough __attribute__((__fallthrough__)) | ^~~~~~~~~~~~~ arch/mips/kernel/perf_event_mipsxx.c:903:3: note: in expansion of macro 'fallthrough' 903 | fallthrough; | ^~~~~~~~~~~ cc1: all warnings being treated as errors Fix it by removing unnecessary "fallthrough" pseudo keywords. Fixes: e9dfbaaeef1c9fe ("MIPS: perf: Add hardware perf events support for new Loongson-3") Reported-by: kbuild test robot <lkp@intel.com> Signed-off-by: Huacai Chen <chenhc@lemote.com> --- arch/mips/kernel/perf_event_mipsxx.c | 2 -- 1 file changed, 2 deletions(-)