Skip to contentSkip to conversation

watchdog/sbc7240_wdt: Fix yet another -Wimplicit-fallthrough warning

PATCH In review Borislav Petkov 2 participants 2 messages Sep 29, 2019 – Sep 30, 2019 Watchdog device drivers

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 watchdog/sbc7240_wdt: Fix yet another -Wimplicit-fallthrough warning

From: Borislav Petkov <[email protected]>

... by moving the fall through comment outside of the code block so that gcc sees it.

No functional changes.

---
 drivers/watchdog/sbc7240_wdt.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/watchdog/sbc7240_wdt.c +1 -2
index 12cdee7d5069..90d67e6d8e8b 100644
@@ -194,9 +194,8 @@ static long fop_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
 
 		if (wdt_set_timeout(new_timeout))
 			return -EINVAL;
-
-		/* Fall through */
 	}
+	/* Fall through */
 	case WDIOC_GETTIMEOUT:
 		return put_user(timeout, (int __user *)arg);
 	default:
Signature · 1 line
2.21.0
maintainer Reviewed-by on v1 1/1
#1 lore raw
Quoted 11 lines · Borislav Petkov

From: Borislav Petkov <[email protected]>

... by moving the fall through comment outside of the code block so that gcc sees it.

No functional changes.

Quoted 20 lines
---
  drivers/watchdog/sbc7240_wdt.c | 3 +--
  1 file changed, 1 insertion(+), 2 deletions(-)
drivers/watchdog/sbc7240_wdt.c +1 -2
index 12cdee7d5069..90d67e6d8e8b 100644
@@ -194,9 +194,8 @@ static long fop_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
 
  		if (wdt_set_timeout(new_timeout))
  			return -EINVAL;
-
-		/* Fall through */
  	}
+	/* Fall through */
  	case WDIOC_GETTIMEOUT:
  		return put_user(timeout, (int __user *)arg);
  	default: