Skip to contentSkip to conversation

watchdog: smsc37b787_wdt: Mark expected switch fall-through

PATCH In review Gustavo A. R. Silva 2 participants 5 messages Feb 14, 2019 – Feb 28, 2019 Watchdog device drivers

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 watchdog: smsc37b787_wdt: Mark expected switch fall-through

In preparation to enabling -Wimplicit-fallthrough, mark switch cases where we are expecting to fall through.

This patch fixes the following warning:

drivers/watchdog/smsc37b787_wdt.c: In function ‘wb_smsc_wdt_ioctl’:
drivers/watchdog/smsc37b787_wdt.c:480:3: warning: this statement may fall through [-Wimplicit-fallthrough=]
wb_smsc_wdt_set_timeout(timeout);
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
drivers/watchdog/smsc37b787_wdt.c:482:2: note: here
case WDIOC_GETTIMEOUT:
^~~~

Warning level 3 was used: -Wimplicit-fallthrough=3

Notice that, in this particular case, the code comment is modified in accordance with what GCC is expecting to find.

This patch is part of the ongoing efforts to enable -Wimplicit-fallthrough.

---
 drivers/watchdog/smsc37b787_wdt.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/watchdog/smsc37b787_wdt.c +1 -1
index 445ea1ad1fa9..c768dcd53034 100644
@@ -478,7 +478,7 @@ static long wb_smsc_wdt_ioctl(struct file *file,
 			return -EINVAL;
 		timeout = new_timeout;
 		wb_smsc_wdt_set_timeout(timeout);
-		/* fall through and return the new timeout... */
+		/* fall through - and return the new timeout... */
 	case WDIOC_GETTIMEOUT:
 		new_timeout = timeout;
 		if (unit == UNIT_MINUTE)
Signature · 1 line
2.20.1
maintainer Reviewed-by on v1 1/1
#1 lore raw
Quoted 15 lines · Gustavo A. R. Silva

In preparation to enabling -Wimplicit-fallthrough, mark switch cases where we are expecting to fall through.

This patch fixes the following warning:

drivers/watchdog/smsc37b787_wdt.c: In function ‘wb_smsc_wdt_ioctl’:
drivers/watchdog/smsc37b787_wdt.c:480:3: warning: this statement may fall through [-Wimplicit-fallthrough=]

    wb_smsc_wdt_set_timeout(timeout);
    ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
drivers/watchdog/smsc37b787_wdt.c:482:2: note: here
   case WDIOC_GETTIMEOUT:
   ^~~~

Warning level 3 was used: -Wimplicit-fallthrough=3

Quoted 7 lines

Notice that, in this particular case, the code comment is modified in accordance with what GCC is expecting to find.

This patch is part of the ongoing efforts to enable -Wimplicit-fallthrough.

Quoted 18 lines
---
  drivers/watchdog/smsc37b787_wdt.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
drivers/watchdog/smsc37b787_wdt.c +1 -1
index 445ea1ad1fa9..c768dcd53034 100644
@@ -478,7 +478,7 @@ static long wb_smsc_wdt_ioctl(struct file *file,
  			return -EINVAL;
  		timeout = new_timeout;
  		wb_smsc_wdt_set_timeout(timeout);
-		/* fall through and return the new timeout... */
+		/* fall through - and return the new timeout... */
  	case WDIOC_GETTIMEOUT:
  		new_timeout = timeout;
  		if (unit == UNIT_MINUTE)
#2 lore raw
Quoted 19 lines · Guenter Roeck
Quoted 18 lines · Gustavo A. R. Silva

In preparation to enabling -Wimplicit-fallthrough, mark switch cases where we are expecting to fall through.

This patch fixes the following warning:

drivers/watchdog/smsc37b787_wdt.c: In function ‘wb_smsc_wdt_ioctl’:
drivers/watchdog/smsc37b787_wdt.c:480:3: warning: this statement may fall through [-Wimplicit-fallthrough=] wb_smsc_wdt_set_timeout(timeout);
    ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
drivers/watchdog/smsc37b787_wdt.c:482:2: note: here
   case WDIOC_GETTIMEOUT:
   ^~~~

Warning level 3 was used: -Wimplicit-fallthrough=3

Notice that, in this particular case, the code comment is modified in accordance with what GCC is expecting to find.

Quoted 7 lines
Quoted 4 lines

This patch is part of the ongoing efforts to enable -Wimplicit-fallthrough.

Thank you, Guenter.

Friendly ping:

Who can take this?

Thanks
--
Gustavo

Quoted 19 lines
Quoted 18 lines

---
  drivers/watchdog/smsc37b787_wdt.c | 2 +-

  1 file changed, 1 insertion(+), 1 deletion(-)
drivers/watchdog/smsc37b787_wdt.c +1 -1
index 445ea1ad1fa9..c768dcd53034 100644
@@ -478,7 +478,7 @@ static long wb_smsc_wdt_ioctl(struct file *file,
               return -EINVAL;
           timeout = new_timeout;
           wb_smsc_wdt_set_timeout(timeout);
-        /* fall through and return the new timeout... */
+        /* fall through - and return the new timeout... */

      case WDIOC_GETTIMEOUT:
          new_timeout = timeout;
          if (unit == UNIT_MINUTE)

maintainer
#3 lore raw
Quoted 30 lines · Gustavo A. R. Silva
Quoted 19 lines · Guenter Roeck
Quoted 18 lines · Gustavo A. R. Silva

In preparation to enabling -Wimplicit-fallthrough, mark switch cases where we are expecting to fall through.

This patch fixes the following warning:

drivers/watchdog/smsc37b787_wdt.c: In function ‘wb_smsc_wdt_ioctl’:
drivers/watchdog/smsc37b787_wdt.c:480:3: warning: this statement may fall through [-Wimplicit-fallthrough=] wb_smsc_wdt_set_timeout(timeout);
    ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
drivers/watchdog/smsc37b787_wdt.c:482:2: note: here
   case WDIOC_GETTIMEOUT:
   ^~~~

Warning level 3 was used: -Wimplicit-fallthrough=3

Notice that, in this particular case, the code comment is modified in accordance with what GCC is expecting to find.

Quoted 7 lines
Quoted 4 lines

This patch is part of the ongoing efforts to enable -Wimplicit-fallthrough.

Quoted 7 lines

Thank you, Guenter.

Friendly ping:

Who can take this?

It is queued in my watchdog-next branch. Usually Wim will pick it up from there.

Guenter

#4 lore raw
Quoted 11 lines · Guenter Roeck
Quoted 6 lines

Friendly ping:

Who can take this?

It is queued in my watchdog-next branch. Usually Wim will pick it up from there.

Guenter

Awesome. :)

Thanks!
--
Gustavo