Merge branch 'for-5.10/core' into for-linus

[linux-2.6-microblaze.git] / drivers / watchdog / sa1100_wdt.c

diff --git a/drivers/watchdog/sa1100_wdt.c b/drivers/watchdog/sa1100_wdt.c
index 9b93be0..27846c6 100644 (file)
--- a/drivers/watchdog/sa1100_wdt.c
+++ b/drivers/watchdog/sa1100_wdt.c
@@ -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);