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

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

[Borislav Petkov]

From: Borislav Petkov <bp@suse.de>

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

No functional changes.

Signed-off-by: Borislav Petkov <bp@suse.de>
Cc: Wim Van Sebroeck <wim@linux-watchdog.org>
Cc: Guenter Roeck <linux@roeck-us.net>
Cc: linux-watchdog@vger.kernel.org
---
 drivers/watchdog/sbc7240_wdt.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/drivers/watchdog/sbc7240_wdt.c b/drivers/watchdog/sbc7240_wdt.c
index 12cdee7d5069..90d67e6d8e8b 100644
--- a/drivers/watchdog/sbc7240_wdt.c
+++ b/drivers/watchdog/sbc7240_wdt.c
@@ -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:
-- 
2.21.0

Re: [PATCH] watchdog/sbc7240_wdt: Fix yet another -Wimplicit-fallthrough warning

[Guenter Roeck]

On 9/29/19 4:46 AM, Borislav Petkov wrote:
> From: Borislav Petkov <bp@suse.de>
> 
> ... by moving the fall through comment outside of the code block so that
> gcc sees it.
> 
> No functional changes.
> 
> Signed-off-by: Borislav Petkov <bp@suse.de>
> Cc: Wim Van Sebroeck <wim@linux-watchdog.org>
> Cc: Guenter Roeck <linux@roeck-us.net>
> Cc: linux-watchdog@vger.kernel.org

Reviewed-by: Guenter Roeck <linux@roeck-us.net>

> ---
>   drivers/watchdog/sbc7240_wdt.c | 3 +--
>   1 file changed, 1 insertion(+), 2 deletions(-)
> 
> diff --git a/drivers/watchdog/sbc7240_wdt.c b/drivers/watchdog/sbc7240_wdt.c
> index 12cdee7d5069..90d67e6d8e8b 100644
> --- a/drivers/watchdog/sbc7240_wdt.c
> +++ b/drivers/watchdog/sbc7240_wdt.c
> @@ -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:
>