| Message ID | 20190810050153.GA13927@embeddedor (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | sh: kernel: disassemble: Mark expected switch fall-throughs | expand |
On Sat, 2019-08-10 at 00:01 -0500, Gustavo A. R. Silva wrote: > Mark switch cases where we are expecting to fall through. > > Fix the following warnings (Building: defconfig sh): [] > diff --git a/arch/sh/kernel/disassemble.c b/arch/sh/kernel/disassemble.c [] > @@ -477,6 +477,7 @@ static void print_sh_insn(u32 memaddr, u16 insn) > case FD_REG_N: > if (0) > goto d_reg_n; Might as well remove this if (0) goto, remove the added comment > + /* else, fall through */ > case F_REG_N: > printk("fr%d", rn); > break; > @@ -488,6 +489,7 @@ static void print_sh_insn(u32 memaddr, u16 insn) > printk("xd%d", rn & ~1); > break; > } > + /* else, fall through */ > d_reg_n: and remove this only use of d_reg_n > case D_REG_N: > printk("dr%d", rn); > @@ -497,6 +499,7 @@ static void print_sh_insn(u32 memaddr, u16 insn) > printk("xd%d", rm & ~1); > break; > } > + /* else, fall through */ > case D_REG_M: > printk("dr%d", rm); > break;
On 8/10/19 12:08 AM, Joe Perches wrote: > On Sat, 2019-08-10 at 00:01 -0500, Gustavo A. R. Silva wrote: >> Mark switch cases where we are expecting to fall through. >> >> Fix the following warnings (Building: defconfig sh): > [] >> diff --git a/arch/sh/kernel/disassemble.c b/arch/sh/kernel/disassemble.c > [] >> @@ -477,6 +477,7 @@ static void print_sh_insn(u32 memaddr, u16 insn) >> case FD_REG_N: >> if (0) >> goto d_reg_n; > > Might as well remove this if (0) goto, > remove the added comment > You're right. I'll respin and stop working this Friday midnight. >> + /* else, fall through */ >> case F_REG_N: >> printk("fr%d", rn); >> break; >> @@ -488,6 +489,7 @@ static void print_sh_insn(u32 memaddr, u16 insn) >> printk("xd%d", rn & ~1); >> break; >> } >> + /* else, fall through */ >> d_reg_n: > > and remove this only use of d_reg_n > Sure. Thanks -- Gustavo >> case D_REG_N: >> printk("dr%d", rn); >> @@ -497,6 +499,7 @@ static void print_sh_insn(u32 memaddr, u16 insn) >> printk("xd%d", rm & ~1); >> break; >> } >> + /* else, fall through */ >> case D_REG_M: >> printk("dr%d", rm); >> break; >
diff --git a/arch/sh/kernel/disassemble.c b/arch/sh/kernel/disassemble.c index defebf1a9c8a..91c87e9891da 100644 --- a/arch/sh/kernel/disassemble.c +++ b/arch/sh/kernel/disassemble.c @@ -477,6 +477,7 @@ static void print_sh_insn(u32 memaddr, u16 insn) case FD_REG_N: if (0) goto d_reg_n; + /* else, fall through */ case F_REG_N: printk("fr%d", rn); break; @@ -488,6 +489,7 @@ static void print_sh_insn(u32 memaddr, u16 insn) printk("xd%d", rn & ~1); break; } + /* else, fall through */ d_reg_n: case D_REG_N: printk("dr%d", rn); @@ -497,6 +499,7 @@ static void print_sh_insn(u32 memaddr, u16 insn) printk("xd%d", rm & ~1); break; } + /* else, fall through */ case D_REG_M: printk("dr%d", rm); break;
Mark switch cases where we are expecting to fall through. Fix the following warnings (Building: defconfig sh): arch/sh/kernel/disassemble.c:478:8: warning: this statement may fall through [-Wimplicit-fallthrough=] arch/sh/kernel/disassemble.c:487:8: warning: this statement may fall through [-Wimplicit-fallthrough=] arch/sh/kernel/disassemble.c:496:8: warning: this statement may fall through [-Wimplicit-fallthrough=] Signed-off-by: Gustavo A. R. Silva <gustavo@embeddedor.com> --- If no one cares, I'll apply this to my tree and queue it up for 5.3-rc4. arch/sh/kernel/disassemble.c | 3 +++ 1 file changed, 3 insertions(+)