summaryrefslogtreecommitdiffstats
path: root/drivers/watchdog
diff options
context:
space:
mode:
authorGustavo A. R. Silva <gustavo@embeddedor.com>2019-02-14 21:20:08 +0100
committerWim Van Sebroeck <wim@linux-watchdog.org>2019-03-02 15:28:21 +0100
commit51c802f57a0c4ce17f472d8fb718ecd94e23c5d3 (patch)
tree873aab305471e7b271444fac21b926f738003d2d /drivers/watchdog
parentwatchdog: pc87413: Mark expected switch fall-through (diff)
downloadlinux-51c802f57a0c4ce17f472d8fb718ecd94e23c5d3.tar.xz
linux-51c802f57a0c4ce17f472d8fb718ecd94e23c5d3.zip
watchdog: sc1200: 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/sc1200wdt.c: In function ‘sc1200wdt_ioctl’: drivers/watchdog/sc1200wdt.c:241:3: warning: this statement may fall through [-Wimplicit-fallthrough=] sc1200wdt_write_data(WDTO, timeout); ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ drivers/watchdog/sc1200wdt.c:244: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. Signed-off-by: Gustavo A. R. Silva <gustavo@embeddedor.com> Reviewed-by: Guenter Roeck <linux@roeck-us.net> Signed-off-by: Guenter Roeck <linux@roeck-us.net> Signed-off-by: Wim Van Sebroeck <wim@linux-watchdog.org>
Diffstat (limited to 'drivers/watchdog')
-rw-r--r--drivers/watchdog/sc1200wdt.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/watchdog/sc1200wdt.c b/drivers/watchdog/sc1200wdt.c
index 8e4e2fc13f87..e035a4d4b299 100644
--- a/drivers/watchdog/sc1200wdt.c
+++ b/drivers/watchdog/sc1200wdt.c
@@ -239,7 +239,7 @@ static long sc1200wdt_ioctl(struct file *file, unsigned int cmd,
return -EINVAL;
timeout = new_timeout;
sc1200wdt_write_data(WDTO, timeout);
- /* fall through and return the new timeout */
+ /* fall through - and return the new timeout */
case WDIOC_GETTIMEOUT:
return put_user(timeout * 60, p);