kevin/linux
1
Fork 0
Code

watchdog: gpio_wdt: Make use of device properties

Browse Source 
Convert the module to be property provider agnostic and allow
it to be used on non-OF platforms.

Include mod_devicetable.h explicitly to replace the dropped of.h
which included mod_devicetable.h indirectly.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Reviewed-by: Guenter Roeck <linux@roeck-us.net>
Link: https://lore.kernel.org/r/20230925123543.2945710-1-andriy.shevchenko@linux.intel.com
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Wim Van Sebroeck <wim@linux-watchdog.org>
This commit is contained in:
Andy Shevchenko 2023-09-25 15:35:43 +03:00 committed by Wim Van Sebroeck
parent 5d6aa89bba
commit 7e5bca6e55
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/watchdog/gpio_wdt.c
View File

@ -5,12 +5,13 @@
* Author: 2013, Alexander Shiyan <shc_work@mail.ru> * Author: 2013, Alexander Shiyan <shc_work@mail.ru>
*/ */
#include <linux/err.h>
#include <linux/delay.h> #include <linux/delay.h>
#include <linux/module.h> #include <linux/err.h>
#include <linux/gpio/consumer.h> #include <linux/gpio/consumer.h>
#include <linux/of.h> #include <linux/mod_devicetable.h>
#include <linux/module.h>
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include <linux/property.h>
#include <linux/watchdog.h> #include <linux/watchdog.h>
static bool nowayout = WATCHDOG_NOWAYOUT; static bool nowayout = WATCHDOG_NOWAYOUT;
@ -106,7 +107,6 @@ static const struct watchdog_ops gpio_wdt_ops = {
static int gpio_wdt_probe(struct platform_device *pdev) static int gpio_wdt_probe(struct platform_device *pdev)
{ {
struct device *dev = &pdev->dev; struct device *dev = &pdev->dev;
struct device_node *np = dev->of_node;
struct gpio_wdt_priv *priv; struct gpio_wdt_priv *priv;
enum gpiod_flags gflags; enum gpiod_flags gflags;
unsigned int hw_margin; unsigned int hw_margin;
@ -119,7 +119,7 @@ static int gpio_wdt_probe(struct platform_device *pdev)
platform_set_drvdata(pdev, priv); platform_set_drvdata(pdev, priv);
ret = of_property_read_string(np, "hw_algo", &algo); ret = device_property_read_string(dev, "hw_algo", &algo);
if (ret) if (ret)
return ret; return ret;
if (!strcmp(algo, "toggle")) { if (!strcmp(algo, "toggle")) {
@ -136,16 +136,14 @@ static int gpio_wdt_probe(struct platform_device *pdev)
if (IS_ERR(priv->gpiod)) if (IS_ERR(priv->gpiod))
return PTR_ERR(priv->gpiod); return PTR_ERR(priv->gpiod);
ret = of_property_read_u32(np, ret = device_property_read_u32(dev, "hw_margin_ms", &hw_margin);
"hw_margin_ms", &hw_margin);
if (ret) if (ret)
return ret; return ret;
/* Disallow values lower than 2 and higher than 65535 ms */ /* Disallow values lower than 2 and higher than 65535 ms */
if (hw_margin < 2 || hw_margin > 65535) if (hw_margin < 2 || hw_margin > 65535)
return -EINVAL; return -EINVAL;
priv->always_running = of_property_read_bool(np, priv->always_running = device_property_read_bool(dev, "always-running");
"always-running");
watchdog_set_drvdata(&priv->wdd, priv); watchdog_set_drvdata(&priv->wdd, priv);