| Message ID | 20211027123135.27458-1-zajec5@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | watchdog: bcm63xx_wdt: fix fallthrough warning | expand |
On 10/27/21 5:31 AM, Rafał Miłecki wrote: > From: Rafał Miłecki <rafal@milecki.pl> > > This fixes: > drivers/watchdog/bcm63xx_wdt.c: In function 'bcm63xx_wdt_ioctl': > drivers/watchdog/bcm63xx_wdt.c:208:17: warning: this statement may fall through [-Wimplicit-fallthrough=] > > Signed-off-by: Rafał Miłecki <rafal@milecki.pl> Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
On Wed, Oct 27, 2021 at 02:31:35PM +0200, Rafał Miłecki wrote: > From: Rafał Miłecki <rafal@milecki.pl> > > This fixes: > drivers/watchdog/bcm63xx_wdt.c: In function 'bcm63xx_wdt_ioctl': > drivers/watchdog/bcm63xx_wdt.c:208:17: warning: this statement may fall through [-Wimplicit-fallthrough=] > > Signed-off-by: Rafał Miłecki <rafal@milecki.pl> [reluctantly] Reviewed-by: Guenter Roeck <linux@roeck-us.net> ... because the driver should really be converted to use the watchdog subsystem, by someone with the necessary hardware to test it. Guenter > --- > drivers/watchdog/bcm63xx_wdt.c | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/drivers/watchdog/bcm63xx_wdt.c b/drivers/watchdog/bcm63xx_wdt.c > index 7cdb25363ea0..56cc262571a5 100644 > --- a/drivers/watchdog/bcm63xx_wdt.c > +++ b/drivers/watchdog/bcm63xx_wdt.c > @@ -207,6 +207,8 @@ static long bcm63xx_wdt_ioctl(struct file *file, unsigned int cmd, > > bcm63xx_wdt_pet(); > > + fallthrough; > + > case WDIOC_GETTIMEOUT: > return put_user(wdt_time, p); > > -- > 2.31.1 >
On 10/27/21 10:31 AM, Guenter Roeck wrote: > On Wed, Oct 27, 2021 at 02:31:35PM +0200, Rafał Miłecki wrote: >> From: Rafał Miłecki <rafal@milecki.pl> >> >> This fixes: >> drivers/watchdog/bcm63xx_wdt.c: In function 'bcm63xx_wdt_ioctl': >> drivers/watchdog/bcm63xx_wdt.c:208:17: warning: this statement may fall through [-Wimplicit-fallthrough=] >> >> Signed-off-by: Rafał Miłecki <rafal@milecki.pl> > > [reluctantly] > > Reviewed-by: Guenter Roeck <linux@roeck-us.net> > > ... because the driver should really be converted to use the watchdog subsystem, > by someone with the necessary hardware to test it. The driver should ideally be removed and we should use bcm7038_wdt.c moving forward. Rafal, is this something you can try on 4908? We would have to pay attention to arch/mips/bcm63xx/dev_wdt.c and introduce a MODULE_DEVICE_TABLE() and platform_device_id so we can key off any BCM63xx-specific behavior.
On 27.10.2021 19:39, Florian Fainelli wrote: > On 10/27/21 10:31 AM, Guenter Roeck wrote: >> On Wed, Oct 27, 2021 at 02:31:35PM +0200, Rafał Miłecki wrote: >>> From: Rafał Miłecki <rafal@milecki.pl> >>> >>> This fixes: >>> drivers/watchdog/bcm63xx_wdt.c: In function 'bcm63xx_wdt_ioctl': >>> drivers/watchdog/bcm63xx_wdt.c:208:17: warning: this statement may fall through [-Wimplicit-fallthrough=] >>> >>> Signed-off-by: Rafał Miłecki <rafal@milecki.pl> >> >> [reluctantly] >> >> Reviewed-by: Guenter Roeck <linux@roeck-us.net> >> >> ... because the driver should really be converted to use the watchdog subsystem, >> by someone with the necessary hardware to test it. > > The driver should ideally be removed and we should use bcm7038_wdt.c > moving forward. Rafal, is this something you can try on 4908? I wasn't sure if I should proceed with bcm63xx_wdt.c or bcm7038_wdt.c so I chose 63xx. Possibly a bad decision, I'm not sure. I've already bcm63xx_wdt.c changes developed locally to support BCM4908. I just need to add Documentation/dt-bindings/ part. I'll do that tomorrow. Then you can let me know if that's acceptable or should I refactor my changes.
On Wed, Oct 27, 2021 at 10:40:07PM +0200, Rafał Miłecki wrote: > On 27.10.2021 19:39, Florian Fainelli wrote: > > On 10/27/21 10:31 AM, Guenter Roeck wrote: > > > On Wed, Oct 27, 2021 at 02:31:35PM +0200, Rafał Miłecki wrote: > > > > From: Rafał Miłecki <rafal@milecki.pl> > > > > > > > > This fixes: > > > > drivers/watchdog/bcm63xx_wdt.c: In function 'bcm63xx_wdt_ioctl': > > > > drivers/watchdog/bcm63xx_wdt.c:208:17: warning: this statement may fall through [-Wimplicit-fallthrough=] > > > > > > > > Signed-off-by: Rafał Miłecki <rafal@milecki.pl> > > > > > > [reluctantly] > > > > > > Reviewed-by: Guenter Roeck <linux@roeck-us.net> > > > > > > ... because the driver should really be converted to use the watchdog subsystem, > > > by someone with the necessary hardware to test it. > > > > The driver should ideally be removed and we should use bcm7038_wdt.c > > moving forward. Rafal, is this something you can try on 4908? > > I wasn't sure if I should proceed with bcm63xx_wdt.c or bcm7038_wdt.c so > I chose 63xx. Possibly a bad decision, I'm not sure. > > I've already bcm63xx_wdt.c changes developed locally to support BCM4908. > I just need to add Documentation/dt-bindings/ part. I'll do that > tomorrow. Then you can let me know if that's acceptable or should I > refactor my changes. I am not sure if that answers your question, but unless you rework the bcm63xx driver to use the watchdog subsystem (which would make it almost identical to the bcm7038 driver), I am not going to accept functional changes to it. Guenter
diff --git a/drivers/watchdog/bcm63xx_wdt.c b/drivers/watchdog/bcm63xx_wdt.c index 7cdb25363ea0..56cc262571a5 100644 --- a/drivers/watchdog/bcm63xx_wdt.c +++ b/drivers/watchdog/bcm63xx_wdt.c @@ -207,6 +207,8 @@ static long bcm63xx_wdt_ioctl(struct file *file, unsigned int cmd, bcm63xx_wdt_pet(); + fallthrough; + case WDIOC_GETTIMEOUT: return put_user(wdt_time, p);