diff options
| author |   Guenter Roeck <linux@roeck-us.net> | 2025-03-11 07:10:09 -0700 |
|---|---|---|
| committer |   Wim Van Sebroeck <wim@linux-watchdog.org> | 2025-03-11 15:52:51 +0100 |
| commit | 594e1e368f09cea198f991ab122dd72ed559a383 (patch) | |
| tree | 971223a3d88a96cf36330c97607cab3551eb2231 | |
| parent | watchdog: lenovo_se30_wdt: include io.h for devm_ioremap() (diff) | |
| download | wireguard-linux-594e1e368f09cea198f991ab122dd72ed559a383.tar.xz wireguard-linux-594e1e368f09cea198f991ab122dd72ed559a383.zip | |
watchdog: Convert to use device property
Use device_property_read_u32() instead of of_property_read_u32() to support
reading the timeout from non-devicetree sources.
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Link: https://lore.kernel.org/r/20250311141009.756975-1-linux@roeck-us.net
Signed-off-by: Wim Van Sebroeck <wim@linux-watchdog.org>
Diffstat (limited to '')
| -rw-r--r-- | drivers/watchdog/watchdog_core.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/watchdog/watchdog_core.c b/drivers/watchdog/watchdog_core.c index d46d8c8c01f2..6152dba4b52c 100644 --- a/drivers/watchdog/watchdog_core.c +++ b/drivers/watchdog/watchdog_core.c @@ -33,7 +33,8 @@ #include <linux/init.h> /* For __init/__exit/... */ #include <linux/idr.h> /* For ida_* macros */ #include <linux/err.h> /* For IS_ERR macros */ -#include <linux/of.h> /* For of_get_timeout_sec */ +#include <linux/of.h> /* For of_alias_get_id */ +#include <linux/property.h> /* For device_property_read_u32 */ #include <linux/suspend.h> #include "watchdog_core.h" /* For watchdog_dev_register/... */ @@ -137,8 +138,7 @@ int watchdog_init_timeout(struct watchdog_device *wdd, } /* try to get the timeout_sec property */ - if (dev && dev->of_node && - of_property_read_u32(dev->of_node, "timeout-sec", &t) == 0) { + if (dev && device_property_read_u32(dev, "timeout-sec", &t) == 0) { if (t && !watchdog_timeout_invalid(wdd, t)) { wdd->timeout = t; return 0; |