Commit 4f719022 authored by Dmitry Torokhov's avatar Dmitry Torokhov Committed by Wim Van Sebroeck
Browse files

watchdog: bd9576_wdt: switch to using devm_fwnode_gpiod_get() 



I would like to stop exporting OF-specific devm_gpiod_get_from_of_node()
so that gpiolib can be cleaned a bit, so let's switch to the generic
fwnode property API.

While at it, switch the rest of the calls to read properties in
bd9576_wdt_probe() to the generic device property API as well.

Signed-off-by: default avatarDmitry Torokhov <dmitry.torokhov@gmail.com>
Reviewed-by: default avatarGuenter Roeck <linux@roeck-us.net>
Reviewed-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Link: https://lore.kernel.org/r/20220903-gpiod_get_from_of_node-remove-v1-10-b29adfb27a6c@gmail.com


Signed-off-by: default avatarGuenter Roeck <linux@roeck-us.net>
Signed-off-by: default avatarWim Van Sebroeck <wim@linux-watchdog.org>
parent 434e5f93

drivers/watchdog/bd9576_wdt.c

+31 −20
Original line number Diff line number Diff line
@@ -9,8 +9,8 @@ 
#include <linux/gpio/consumer.h>

#include <linux/mfd/rohm-bd957x.h>

#include <linux/module.h>

#include <linux/of.h>

#include <linux/platform_device.h>

#include <linux/property.h>

#include <linux/regmap.h>

#include <linux/watchdog.h>
@@ -202,10 +202,10 @@ static int bd957x_set_wdt_mode(struct bd9576_wdt_priv *priv, int hw_margin, 
static int bd9576_wdt_probe(struct platform_device *pdev)

{

	struct device *dev = &pdev->dev;

	struct device_node *np = dev->parent->of_node;

	struct bd9576_wdt_priv *priv;

	u32 hw_margin[2];

	u32 hw_margin_max = BD957X_WDT_DEFAULT_MARGIN, hw_margin_min = 0;

	int count;

	int ret;



	priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL);
@@ -221,40 +221,51 @@ static int bd9576_wdt_probe(struct platform_device *pdev) 
		return -ENODEV;

	}



	priv->gpiod_en = devm_gpiod_get_from_of_node(dev, dev->parent->of_node,

						     "rohm,watchdog-enable-gpios",

						     0, GPIOD_OUT_LOW,

	priv->gpiod_en = devm_fwnode_gpiod_get(dev, dev_fwnode(dev->parent),

					       "rohm,watchdog-enable",

					       GPIOD_OUT_LOW,

					       "watchdog-enable");

	if (IS_ERR(priv->gpiod_en))

		return dev_err_probe(dev, PTR_ERR(priv->gpiod_en),

			      "getting watchdog-enable GPIO failed\n");



	priv->gpiod_ping = devm_gpiod_get_from_of_node(dev, dev->parent->of_node,

						     "rohm,watchdog-ping-gpios",

						     0, GPIOD_OUT_LOW,

	priv->gpiod_ping = devm_fwnode_gpiod_get(dev, dev_fwnode(dev->parent),

						 "rohm,watchdog-ping",

						 GPIOD_OUT_LOW,

						 "watchdog-ping");

	if (IS_ERR(priv->gpiod_ping))

		return dev_err_probe(dev, PTR_ERR(priv->gpiod_ping),

				     "getting watchdog-ping GPIO failed\n");



	ret = of_property_read_variable_u32_array(np, "rohm,hw-timeout-ms",

						  &hw_margin[0], 1, 2);

	if (ret < 0 && ret != -EINVAL)

	count = device_property_count_u32(dev->parent, "rohm,hw-timeout-ms");

	if (count < 0 && count != -EINVAL)

		return count;



	if (count > 0) {

		if (count > ARRAY_SIZE(hw_margin))

			return -EINVAL;



		ret = device_property_read_u32_array(dev->parent,

						     "rohm,hw-timeout-ms",

						     hw_margin, count);

		if (ret < 0)

			return ret;



	if (ret == 1)

		if (count == 1)

			hw_margin_max = hw_margin[0];



	if (ret == 2) {

		if (count == 2) {

			hw_margin_max = hw_margin[1];

			hw_margin_min = hw_margin[0];

		}

	}



	ret = bd957x_set_wdt_mode(priv, hw_margin_max, hw_margin_min);

	if (ret)

		return ret;



	priv->always_running = of_property_read_bool(np, "always-running");

	priv->always_running = device_property_read_bool(dev->parent,

							 "always-running");



	watchdog_set_drvdata(&priv->wdd, priv);