Skip to contentSkip to conversation

watchdog: sch311x_wdt: Mark expected switch fall-through

PATCH In review Gustavo A. R. Silva 2 participants 2 messages Mar 27, 2018 Watchdog device drivers

lore
Share & tools
lore
#0 lore raw

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

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

Notice that in this particular case I replaced "Fall" with a proper "Fall through" comment, which is what GCC is expecting to find.

---
 drivers/watchdog/sch311x_wdt.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/watchdog/sch311x_wdt.c +1 -1
index 43d0cbb..814cdf5 100644
@@ -299,7 +299,7 @@ static long sch311x_wdt_ioctl(struct file *file, unsigned int cmd,
 		if (sch311x_wdt_set_heartbeat(new_timeout))
 			return -EINVAL;
 		sch311x_wdt_keepalive();
-		/* Fall */
+		/* Fall through */
 	case WDIOC_GETTIMEOUT:
 		return put_user(timeout, p);
 	default:
Signature · 1 line
2.7.4
maintainer Reviewed-by on v1 1/1
#1 lore raw
Quoted 7 lines · Gustavo A. R. Silva

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

Notice that in this particular case I replaced "Fall" with a proper "Fall through" comment, which is what GCC is expecting to find.

Quoted 18 lines
---
  drivers/watchdog/sch311x_wdt.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
drivers/watchdog/sch311x_wdt.c +1 -1
index 43d0cbb..814cdf5 100644
@@ -299,7 +299,7 @@ static long sch311x_wdt_ioctl(struct file *file, unsigned int cmd,
  		if (sch311x_wdt_set_heartbeat(new_timeout))
  			return -EINVAL;
  		sch311x_wdt_keepalive();
-		/* Fall */
+		/* Fall through */
  	case WDIOC_GETTIMEOUT:
  		return put_user(timeout, p);
  	default: