Commit 594e1e36 authored by Guenter Roeck's avatar Guenter Roeck Committed by Wim Van Sebroeck
Browse files

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: default avatarGuenter Roeck <linux@roeck-us.net>
Link: https://lore.kernel.org/r/20250311141009.756975-1-linux@roeck-us.net


Signed-off-by: default avatarWim Van Sebroeck <wim@linux-watchdog.org>
parent 0ccd5d56

drivers/watchdog/watchdog_core.c

+3 −3
Original line number Diff line number Diff line
@@ -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;