watchdog: f71808e_wdt: mark expected switch fall-throughs

PATCH In review Gustavo A. R. Silva 2 participants 3 messages Nov 2, 2017 – Nov 3, 2017 Watchdog device drivers

lore

Share & tools

lore

Gustavo A. R. Silva

author

2017-11-02 19:28 UTC #0 lore raw

PATCH 1/1 watchdog: f71808e_wdt: mark expected switch fall-throughs

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.

Signed-off-by Gustavo A. R. Silva <[email protected]>

---
 drivers/watchdog/f71808e_wdt.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

drivers/watchdog/f71808e_wdt.c +2 -2

index 8658dba..e0678c1 100644
@@ -627,7 +627,7 @@ static long watchdog_ioctl(struct file *file, unsigned int cmd,
 
 		if (new_options & WDIOS_ENABLECARD)
 			return watchdog_start();
-
+		/* fall through */
 
 	case WDIOC_KEEPALIVE:
 		watchdog_keepalive();

@@ -641,7 +641,7 @@ static long watchdog_ioctl(struct file *file, unsigned int cmd,
 			return -EINVAL;
 
 		watchdog_keepalive();
-		/* Fall */
+		/* fall through */
 
 	case WDIOC_GETTIMEOUT:
 		return put_user(watchdog.timeout, uarg.i);

Signature · 1 line

2.7.4

Guenter Roeck

maintainer Reviewed-by on v1 1/1

2017-11-03 13:34 UTC #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.
Signed-off-by Gustavo A. R. Silva <[email protected]>

Reviewed-by Guenter Roeck <[email protected]>

Quoted 26 lines

---
 drivers/watchdog/f71808e_wdt.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

drivers/watchdog/f71808e_wdt.c +2 -2

index 8658dba..e0678c1 100644
@@ -627,7 +627,7 @@ static long watchdog_ioctl(struct file *file, unsigned int cmd,
 
 		if (new_options & WDIOS_ENABLECARD)
 			return watchdog_start();
-
+		/* fall through */
 
 	case WDIOC_KEEPALIVE:
 		watchdog_keepalive();

@@ -641,7 +641,7 @@ static long watchdog_ioctl(struct file *file, unsigned int cmd,
 			return -EINVAL;
 
 		watchdog_keepalive();
-		/* Fall */
+		/* fall through */
 
 	case WDIOC_GETTIMEOUT:
 		return put_user(watchdog.timeout, uarg.i);

Gustavo A. R. Silva

author

2017-11-03 14:44 UTC #2 lore raw

Quoting Guenter Roeck <[email protected]>:

Quoted 11 lines · Gustavo A. R. Silva

Quoted 7 lines
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.
Signed-off-by Gustavo A. R. Silva <[email protected]>
Reviewed-by Guenter Roeck <[email protected]>

Thanks!

--
Gustavo A. R. Silva

Quoted 28 lines

---
 drivers/watchdog/f71808e_wdt.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

drivers/watchdog/f71808e_wdt.c +1 -1

index 8658dba..e0678c1 100644
@@ -627,7 +627,7 @@ static long watchdog_ioctl(struct file *file,  
 unsigned int cmd,
 
 		if (new_options & WDIOS_ENABLECARD)
 			return watchdog_start();
-
+		/* fall through */
 
 	case WDIOC_KEEPALIVE:

drivers/watchdog/f71808e_wdt.c +1 -1

 		watchdog_keepalive();

@@ -641,7 +641,7 @@ static long watchdog_ioctl(struct file *file,  
 unsigned int cmd,
 			return -EINVAL;
 
 		watchdog_keepalive();
-		/* Fall */
+		/* fall through */
 
 	case WDIOC_GETTIMEOUT:

return put_user(watchdog.timeout, uarg.i);