]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
watchdog: s32g_wdt: remove incorrect options in watchdog_info struct
authorEthan Nelson-Moore <enelsonmoore@gmail.com>
Tue, 5 May 2026 02:44:09 +0000 (19:44 -0700)
committerGuenter Roeck <linux@roeck-us.net>
Thu, 2 Jul 2026 14:09:51 +0000 (07:09 -0700)
The s32g_wdt driver uses two incorrect constants in the options field
of its watchdog_info struct. This bit mask should contain WDIOF_*
constants, but the driver uses two WDIOC_* ioctl constants (in addition
to correct WDIOF_* constants). This causes many incorrect bits to be
set in the bit mask. The functionality indicated by these ioctl
constants is supported by all drivers using the watchdog framework, so
this patch simply removes them.

Fixes: bd3f54ec559b ("watchdog: Add the Watchdog Timer for the NXP S32 platform")
Cc: stable@vger.kernel.org # 6.18+
Signed-off-by: Ethan Nelson-Moore <enelsonmoore@gmail.com>
Acked-by: Daniel Lezcano <daniel.lezcano@oss.qualcomm.com>
Link: https://lore.kernel.org/r/20260505024409.60301-1-enelsonmoore@gmail.com
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
drivers/watchdog/s32g_wdt.c

index ad55063060af6065096f348543efec1f759ab5c7..6422a694fc65fff6d754d81fb16cd782b6421db2 100644 (file)
@@ -56,8 +56,7 @@ MODULE_PARM_DESC(early_enable,
 
 static const struct watchdog_info s32g_wdt_info = {
        .identity = "s32g watchdog",
-       .options = WDIOF_KEEPALIVEPING | WDIOF_SETTIMEOUT | WDIOF_MAGICCLOSE |
-       WDIOC_GETTIMEOUT | WDIOC_GETTIMELEFT,
+       .options = WDIOF_KEEPALIVEPING | WDIOF_SETTIMEOUT | WDIOF_MAGICCLOSE,
 };
 
 static struct s32g_wdt_device *wdd_to_s32g_wdt(struct watchdog_device *wdd)