Skip to contentSkip to conversation

watchdog: imx_sc_wdt: fix pretimeout

PATCH RESEND In review Stefan Eichenberger 2 participants 2 messages May 19, 2021

Subsystems (2)
Arm i.MX and Layerscape Watchdog device drivers
lore
Share & tools
lore

Stefan Eichenberger

author
#0 lore raw

PATCH RESEND v2 1/1 watchdog: imx_sc_wdt: fix pretimeout

If the WDIOF_PRETIMEOUT flag is not set when registering the device the driver will not show the sysfs entries or register the default governor. By moving the registering after the decision whether pretimeout is supported this gets fixed.

Signed-off-by Stefan Eichenberger <[email protected]>
Reviewed-by Guenter Roeck <[email protected]>
---
 drivers/watchdog/imx_sc_wdt.c | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)
drivers/watchdog/imx_sc_wdt.c +4 -7
index e9ee22a7cb45..8ac021748d16 100644
@@ -183,16 +183,12 @@ static int imx_sc_wdt_probe(struct platform_device *pdev)
 	watchdog_stop_on_reboot(wdog);
 	watchdog_stop_on_unregister(wdog);
 
-	ret = devm_watchdog_register_device(dev, wdog);
-	if (ret)
-		return ret;
-
 	ret = imx_scu_irq_group_enable(SC_IRQ_GROUP_WDOG,
 				       SC_IRQ_WDOG,
 				       true);
 	if (ret) {
 		dev_warn(dev, "Enable irq failed, pretimeout NOT supported\n");
-		return 0;
+		goto register_device;
 	}
 
 	imx_sc_wdd->wdt_notifier.notifier_call = imx_sc_wdt_notify;

@@ -203,7 +199,7 @@ static int imx_sc_wdt_probe(struct platform_device *pdev)
 					 false);
 		dev_warn(dev,
 			 "Register irq notifier failed, pretimeout NOT supported\n");
-		return 0;
+		goto register_device;
 	}
 
 	ret = devm_add_action_or_reset(dev, imx_sc_wdt_action,

@@ -213,7 +209,8 @@ static int imx_sc_wdt_probe(struct platform_device *pdev)
 	else
 		dev_warn(dev, "Add action failed, pretimeout NOT supported\n");
 
-	return 0;
+register_device:
+	return devm_watchdog_register_device(dev, wdog);
 }
 
 static int __maybe_unused imx_sc_wdt_suspend(struct device *dev)
Signature · 1 line
2.27.0
Reviewed-by on v2 1/1
#1 lore raw
Quoted 10 lines

From: Stefan Eichenberger <[email protected]>
Sent: Wednesday, May 19, 2021 4:03 PM

If the WDIOF_PRETIMEOUT flag is not set when registering the device the driver will not show the sysfs entries or register the default governor. By moving the registering after the decision whether pretimeout is supported this gets fixed.

Signed-off-by Stefan Eichenberger <[email protected]>
Reviewed-by Guenter Roeck <[email protected]>
Reviewed-by Dong Aisheng <[email protected]>

Regards
Aisheng