Commit bd490f82 authored by Gustavo A. R. Silva's avatar Gustavo A. R. Silva Committed by Wim Van Sebroeck
Browse files

watchdog: Use fallthrough pseudo-keyword 

Replace the existing /* fall through */ comments and its variants with
the new pseudo-keyword macro fallthrough[1]. Also, remove unnecessary
fall-through markings when it is the case.

[1] https://www.kernel.org/doc/html/latest/process/deprecated.html?highlight=fallthrough#implicit-switch-case-fall-through



Signed-off-by: default avatarGustavo A. R. Silva <gustavoars@kernel.org>
Reviewed-by: default avatarGuenter Roeck <linux@roeck-us.net>
Link: https://lore.kernel.org/r/20200707171121.GA13472@embeddedor


Signed-off-by: default avatarGuenter Roeck <linux@roeck-us.net>
Signed-off-by: default avatarWim Van Sebroeck <wim@linux-watchdog.org>
parent 5edc8c68

drivers/watchdog/advantechwdt.c

+1 −1
Original line number Diff line number Diff line
@@ -177,7 +177,7 @@ static long advwdt_ioctl(struct file *file, unsigned int cmd, unsigned long arg) 
		if (advwdt_set_heartbeat(new_timeout))

			return -EINVAL;

		advwdt_ping();

		/* fall through */

		fallthrough;

	case WDIOC_GETTIMEOUT:

		return put_user(timeout, p);

	default:

drivers/watchdog/alim1535_wdt.c

+1 −1
Original line number Diff line number Diff line
@@ -220,7 +220,7 @@ static long ali_ioctl(struct file *file, unsigned int cmd, unsigned long arg) 
			return -EINVAL;

		ali_keepalive();

	}

		/* fall through */

		fallthrough;

	case WDIOC_GETTIMEOUT:

		return put_user(timeout, p);

	default:

drivers/watchdog/alim7101_wdt.c

+1 −1
Original line number Diff line number Diff line
@@ -279,7 +279,7 @@ static long fop_ioctl(struct file *file, unsigned int cmd, unsigned long arg) 
		timeout = new_timeout;

		wdt_keepalive();

	}

		/* Fall through */

		fallthrough;

	case WDIOC_GETTIMEOUT:

		return put_user(timeout, p);

	default:

drivers/watchdog/ar7_wdt.c

+1 −2
Original line number Diff line number Diff line
@@ -235,8 +235,7 @@ static long ar7_wdt_ioctl(struct file *file, 
		ar7_wdt_update_margin(new_margin);

		ar7_wdt_kick(1);

		spin_unlock(&wdt_lock);

		/* Fall through */



		fallthrough;

	case WDIOC_GETTIMEOUT:

		if (put_user(margin, (int *)arg))

			return -EFAULT;

drivers/watchdog/ath79_wdt.c

+1 −1
Original line number Diff line number Diff line
@@ -215,8 +215,8 @@ static long ath79_wdt_ioctl(struct file *file, unsigned int cmd, 
		err = ath79_wdt_set_timeout(t);

		if (err)

			break;

		fallthrough;



		/* fallthrough */

	case WDIOC_GETTIMEOUT:

		err = put_user(timeout, p);

		break;