Commit 83c7cdee authored by Krzysztof Kozlowski's avatar Krzysztof Kozlowski Committed by Mark Brown

regulator: bd718x7: Use scoped device node handling to simplify error paths

Obtain the device node reference with scoped/cleanup.h and use scoped
for_each_child_of_node_scoped() to reduce error handling and make the
code a bit simpler.
Signed-off-by: default avatarKrzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Link: https://patch.msgid.link/20240814-cleanup-h-of-node-put-regulator-v1-1-87151088b883@linaro.orgSigned-off-by: default avatarMark Brown <broonie@kernel.org>
parent b31274ca
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
// Copyright (C) 2018 ROHM Semiconductors // Copyright (C) 2018 ROHM Semiconductors
// bd71837-regulator.c ROHM BD71837MWV/BD71847MWV regulator driver // bd71837-regulator.c ROHM BD71837MWV/BD71847MWV regulator driver
#include <linux/cleanup.h>
#include <linux/delay.h> #include <linux/delay.h>
#include <linux/err.h> #include <linux/err.h>
#include <linux/interrupt.h> #include <linux/interrupt.h>
...@@ -1635,18 +1636,17 @@ static int get_special_regulators(struct device *dev, ...@@ -1635,18 +1636,17 @@ static int get_special_regulators(struct device *dev,
unsigned int num_reg_data, int *info) unsigned int num_reg_data, int *info)
{ {
int ret; int ret;
struct device_node *np;
struct device_node *nproot = dev->of_node;
int uv; int uv;
*info = 0; *info = 0;
nproot = of_get_child_by_name(nproot, "regulators"); struct device_node *nproot __free(device_node) = of_get_child_by_name(dev->of_node,
"regulators");
if (!nproot) { if (!nproot) {
dev_err(dev, "failed to find regulators node\n"); dev_err(dev, "failed to find regulators node\n");
return -ENODEV; return -ENODEV;
} }
for_each_child_of_node(nproot, np) { for_each_child_of_node_scoped(nproot, np) {
if (of_property_read_bool(np, "rohm,no-regulator-enable-control")) if (of_property_read_bool(np, "rohm,no-regulator-enable-control"))
mark_hw_controlled(dev, np, reg_data, num_reg_data, mark_hw_controlled(dev, np, reg_data, num_reg_data,
info); info);
...@@ -1656,22 +1656,15 @@ static int get_special_regulators(struct device *dev, ...@@ -1656,22 +1656,15 @@ static int get_special_regulators(struct device *dev,
if (ret == -EINVAL) if (ret == -EINVAL)
continue; continue;
else else
goto err_out; return ret;
} }
ret = setup_feedback_loop(dev, np, reg_data, num_reg_data, uv); ret = setup_feedback_loop(dev, np, reg_data, num_reg_data, uv);
if (ret) if (ret)
goto err_out; return ret;
} }
of_node_put(nproot);
return 0; return 0;
err_out:
of_node_put(np);
of_node_put(nproot);
return ret;
} }
static int bd718xx_probe(struct platform_device *pdev) static int bd718xx_probe(struct platform_device *pdev)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment