Kernel/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-01-04 04:04:19 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

watchdog: Use fallthrough pseudo-keyword

Browse Source 
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: Gustavo A. R. Silva <gustavoars@kernel.org>
Reviewed-by: Guenter Roeck <linux@roeck-us.net>
Link: https://lore.kernel.org/r/20200707171121.GA13472@embeddedor
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Wim Van Sebroeck <wim@linux-watchdog.org>
This commit is contained in:
Gustavo A. R. Silva 2020-07-07 12:11:21 -05:00 committed by Wim Van Sebroeck
parent 5edc8c6873
commit bd490f8222
38 changed files with 39 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/watchdog/advantechwdt.c
View File

@ -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:

2
drivers/watchdog/alim1535_wdt.c
View File

@ -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:

2
drivers/watchdog/alim7101_wdt.c
View File

@ -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:

3
drivers/watchdog/ar7_wdt.c
View File

@ -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;

2
drivers/watchdog/ath79_wdt.c
View File

@ -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;

2
drivers/watchdog/eurotechwdt.c
View File

@ -286,7 +286,7 @@ static long eurwdt_ioctl(struct file *file,
eurwdt_timeout = time;
eurwdt_set_timeout(time);
spin_unlock(&eurwdt_lock);
/* fall through */
fallthrough;
case WDIOC_GETTIMEOUT:
return put_user(eurwdt_timeout, p);

4
drivers/watchdog/f71808e_wdt.c
View File

@ -612,7 +612,7 @@ static long watchdog_ioctl(struct file *file, unsigned int cmd,
if (new_options & WDIOS_ENABLECARD)
return watchdog_start();
/* fall through */
fallthrough;
case WDIOC_KEEPALIVE:
watchdog_keepalive();
@ -626,7 +626,7 @@ static long watchdog_ioctl(struct file *file, unsigned int cmd,
return -EINVAL;
watchdog_keepalive();
/* fall through */
fallthrough;
case WDIOC_GETTIMEOUT:
return put_user(watchdog.timeout, uarg.i);

2
drivers/watchdog/gef_wdt.c
View File

@ -201,7 +201,7 @@ static long gef_wdt_ioctl(struct file *file, unsigned int cmd,
if (get_user(timeout, (int __user *)argp))
return -EFAULT;
gef_wdt_set_timeout(timeout);
/* Fall through */
fallthrough;
case WDIOC_GETTIMEOUT:
if (put_user(gef_wdt_timeout, (int __user *)argp))

2
drivers/watchdog/geodewdt.c
View File

@ -185,7 +185,7 @@ static long geodewdt_ioctl(struct file *file, unsigned int cmd,
if (geodewdt_set_heartbeat(interval))
return -EINVAL;
/* Fall through */
fallthrough;
case WDIOC_GETTIMEOUT:
return put_user(timeout, p);

2
drivers/watchdog/ib700wdt.c
View File

@ -214,7 +214,7 @@ static long ibwdt_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
if (ibwdt_set_heartbeat(new_margin))
return -EINVAL;
ibwdt_ping();
/* fall through */
fallthrough;
case WDIOC_GETTIMEOUT:
return put_user(timeout, p);

2
drivers/watchdog/it8712f_wdt.c
View File

@ -303,7 +303,7 @@ static long it8712f_wdt_ioctl(struct file *file, unsigned int cmd,
superio_exit();
it8712f_wdt_ping();
/* Fall through */
fallthrough;
case WDIOC_GETTIMEOUT:
if (put_user(margin, p))
return -EFAULT;

2
drivers/watchdog/ixp4xx_wdt.c
View File

@ -136,7 +136,7 @@ static long ixp4xx_wdt_ioctl(struct file *file, unsigned int cmd,
heartbeat = time;
wdt_enable();
/* Fall through */
fallthrough;
case WDIOC_GETTIMEOUT:
ret = put_user(heartbeat, (int *)arg);

2
drivers/watchdog/m54xx_wdt.c
View File

@ -155,7 +155,7 @@ static long m54xx_wdt_ioctl(struct file *file, unsigned int cmd,
heartbeat = time;
wdt_enable();
/* Fall through */
fallthrough;
case WDIOC_GETTIMEOUT:
ret = put_user(heartbeat, (int *)arg);

2
drivers/watchdog/machzwd.c
View File

@ -171,7 +171,7 @@ static inline void zf_set_timer(unsigned short new, unsigned char n)
switch (n) {
case WD1:
zf_writew(COUNTER_1, new);
/* fall through */
fallthrough;
case WD2:
zf_writeb(COUNTER_2, new > 0xff ? 0xff : new);
default:

2
drivers/watchdog/mv64x60_wdt.c
View File

@ -222,7 +222,7 @@ static long mv64x60_wdt_ioctl(struct file *file,
if (get_user(timeout, (int __user *)argp))
return -EFAULT;
mv64x60_wdt_set_timeout(timeout);
/* Fall through */
fallthrough;
case WDIOC_GETTIMEOUT:
if (put_user(mv64x60_wdt_timeout, (int __user *)argp))

2
drivers/watchdog/nv_tco.c
View File

@ -250,7 +250,7 @@ static long nv_tco_ioctl(struct file *file, unsigned int cmd,
if (tco_timer_set_heartbeat(new_heartbeat))
return -EINVAL;
tco_timer_keepalive();
/* Fall through */
fallthrough;
case WDIOC_GETTIMEOUT:
return put_user(heartbeat, p);
default:

2
drivers/watchdog/pc87413_wdt.c
View File

@ -433,7 +433,7 @@ static long pc87413_ioctl(struct file *file, unsigned int cmd,
return -EINVAL;
timeout = new_timeout;
pc87413_refresh();
/* fall through - and return the new timeout... */
fallthrough; /* and return the new timeout */
case WDIOC_GETTIMEOUT:
new_timeout = timeout * 60;
return put_user(new_timeout, uarg.i);

2
drivers/watchdog/pcwd.c
View File

@ -651,7 +651,7 @@ static long pcwd_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
return -EINVAL;
pcwd_keepalive();
/* Fall through */
fallthrough;
case WDIOC_GETTIMEOUT:
return put_user(heartbeat, argp);

2
drivers/watchdog/pcwd_pci.c
View File

@ -542,7 +542,7 @@ static long pcipcwd_ioctl(struct file *file, unsigned int cmd,
pcipcwd_keepalive();
}
/* fall through */
fallthrough;
case WDIOC_GETTIMEOUT:
return put_user(heartbeat, p);

2
drivers/watchdog/pcwd_usb.c
View File

@ -452,7 +452,7 @@ static long usb_pcwd_ioctl(struct file *file, unsigned int cmd,
usb_pcwd_keepalive(usb_pcwd_device);
}
/* fall through */
fallthrough;
case WDIOC_GETTIMEOUT:
return put_user(heartbeat, p);

2
drivers/watchdog/rc32434_wdt.c
View File

@ -230,7 +230,7 @@ static long rc32434_wdt_ioctl(struct file *file, unsigned int cmd,
return -EFAULT;
if (rc32434_wdt_set(new_timeout))
return -EINVAL;
/* Fall through */
fallthrough;
case WDIOC_GETTIMEOUT:
return copy_to_user(argp, &timeout, sizeof(int)) ? -EFAULT : 0;
default:

2
drivers/watchdog/riowd.c
View File

@ -134,7 +134,7 @@ static long riowd_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
return -EINVAL;
riowd_timeout = (new_margin + 59) / 60;
riowd_writereg(p, riowd_timeout, WDTO_INDEX);
/* Fall through */
fallthrough;
case WDIOC_GETTIMEOUT:
return put_user(riowd_timeout * 60, (int __user *)argp);

2
drivers/watchdog/sa1100_wdt.c
View File

@ -127,7 +127,7 @@ static long sa1100dog_ioctl(struct file *file, unsigned int cmd,
pre_margin = oscr_freq * time;
writel_relaxed(readl_relaxed(OSCR) + pre_margin, OSMR3);
/*fall through*/
fallthrough;
case WDIOC_GETTIMEOUT:
ret = put_user(pre_margin / oscr_freq, p);

2
drivers/watchdog/sb_wdog.c
View File

@ -202,7 +202,7 @@ static long sbwdog_ioctl(struct file *file, unsigned int cmd,
timeout = time;
sbwdog_set(user_dog, timeout);
sbwdog_pet(user_dog);
/* Fall through */
fallthrough;
case WDIOC_GETTIMEOUT:
/*

2
drivers/watchdog/sbc60xxwdt.c
View File

@ -265,7 +265,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:

2
drivers/watchdog/sbc7240_wdt.c
View File

@ -195,7 +195,7 @@ static long fop_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
if (wdt_set_timeout(new_timeout))
return -EINVAL;
}
/* Fall through */
fallthrough;
case WDIOC_GETTIMEOUT:
return put_user(timeout, (int __user *)arg);
default:

2
drivers/watchdog/sbc_fitpc2_wdt.c
View File

@ -154,7 +154,7 @@ static long fitpc2_wdt_ioctl(struct file *file, unsigned int cmd,
margin = time;
wdt_enable();
/* Fall through */
fallthrough;
case WDIOC_GETTIMEOUT:
ret = put_user(margin, (int *)arg);

2
drivers/watchdog/sc520_wdt.c
View File

@ -321,7 +321,7 @@ static long fop_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
wdt_keepalive();
}
/* Fall through */
fallthrough;
case WDIOC_GETTIMEOUT:
return put_user(timeout, p);
default:

2
drivers/watchdog/sch311x_wdt.c
View File

@ -295,7 +295,7 @@ static long sch311x_wdt_ioctl(struct file *file, unsigned int cmd,
if (sch311x_wdt_set_heartbeat(new_timeout))
return -EINVAL;
sch311x_wdt_keepalive();
/* Fall through */
fallthrough;
case WDIOC_GETTIMEOUT:
return put_user(timeout, p);
default:

2
drivers/watchdog/smsc37b787_wdt.c
View File

@ -474,7 +474,7 @@ static long wb_smsc_wdt_ioctl(struct file *file,
return -EINVAL;
timeout = new_timeout;
wb_smsc_wdt_set_timeout(timeout);
/* fall through - and return the new timeout... */
fallthrough; /* and return the new timeout */
case WDIOC_GETTIMEOUT:
new_timeout = timeout;
if (unit == UNIT_MINUTE)

2
drivers/watchdog/w83877f_wdt.c
View File

@ -289,7 +289,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:

2
drivers/watchdog/w83977f_wdt.c
View File

@ -422,7 +422,7 @@ static long wdt_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
return -EINVAL;
wdt_keepalive();
/* Fall through */
fallthrough;
case WDIOC_GETTIMEOUT:
return put_user(timeout, uarg.i);

2
drivers/watchdog/wafer5823wdt.c
View File

@ -174,7 +174,7 @@ static long wafwdt_ioctl(struct file *file, unsigned int cmd,
timeout = new_timeout;
wafwdt_stop();
wafwdt_start();
/* Fall through */
fallthrough;
case WDIOC_GETTIMEOUT:
return put_user(timeout, p);

2
drivers/watchdog/watchdog_dev.c
View File

@ -776,7 +776,7 @@ static long watchdog_ioctl(struct file *file, unsigned int cmd,
err = watchdog_ping(wdd);
if (err < 0)
break;
/* fall through */
fallthrough;
case WDIOC_GETTIMEOUT:
/* timeout == 0 means that we don't know the timeout */
if (wdd->timeout == 0) {

2
drivers/watchdog/wdt.c
View File

@ -389,7 +389,7 @@ static long wdt_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
if (wdt_set_heartbeat(new_heartbeat))
return -EINVAL;
wdt_ping();
/* Fall through */
fallthrough;
case WDIOC_GETTIMEOUT:
return put_user(heartbeat, p);
default:

2
drivers/watchdog/wdt285.c
View File

@ -168,7 +168,7 @@ static long watchdog_ioctl(struct file *file, unsigned int cmd,
soft_margin = new_margin;
reload = soft_margin * (mem_fclk_21285 / 256);
watchdog_ping();
/* Fall through */
fallthrough;
case WDIOC_GETTIMEOUT:
ret = put_user(soft_margin, int_arg);
break;

2
drivers/watchdog/wdt977.c
View File

@ -398,7 +398,7 @@ static long wdt977_ioctl(struct file *file, unsigned int cmd,
return -EINVAL;
wdt977_keepalive();
/* Fall through */
fallthrough;
case WDIOC_GETTIMEOUT:
return put_user(timeout, uarg.i);

2
drivers/watchdog/wdt_pci.c
View File

@ -426,7 +426,7 @@ static long wdtpci_ioctl(struct file *file, unsigned int cmd,
if (wdtpci_set_heartbeat(new_heartbeat))
return -EINVAL;
wdtpci_ping();
/* fall through */
fallthrough;
case WDIOC_GETTIMEOUT:
return put_user(heartbeat, p);
default: