[PATCH] watchdog: s32g_wdt: remove incorrect options in watchdog_info struct

[PATCH] watchdog: s32g_wdt: remove incorrect options in watchdog_info struct

[Ethan Nelson-Moore]

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>
---
 drivers/watchdog/s32g_wdt.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/drivers/watchdog/s32g_wdt.c b/drivers/watchdog/s32g_wdt.c
index ad55063060af..6422a694fc65 100644
--- a/drivers/watchdog/s32g_wdt.c
+++ b/drivers/watchdog/s32g_wdt.c
@@ -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)
-- 
2.43.0

Re: [PATCH] watchdog: s32g_wdt: remove incorrect options in watchdog_info struct

[Daniel Lezcano]

On 5/5/26 04:44, Ethan Nelson-Moore wrote:
> 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>

Re: [PATCH] watchdog: s32g_wdt: remove incorrect options in watchdog_info struct

[Guenter Roeck]

On Mon, May 04, 2026 at 07:44:09PM -0700, Ethan Nelson-Moore wrote:
> 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>

Applied to my watchdog branch.

Thanks,
Guenter