Gh0st
/
linux
mirror of https://github.com/torvalds/linux.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

gpio: of: simplify with scoped for each OF child loop 

Use scoped for_each_xxx loop when iterating over device nodes to make
code a bit simpler.

Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Link: https://lore.kernel.org/r/20240816151356.154991-1-krzysztof.kozlowski@linaro.org
Signed-off-by: Bartosz Golaszewski <bartosz.golaszewski@linaro.org>
This commit is contained in:
Krzysztof Kozlowski 2024-08-16 17:13:56 +02:00 committed by Bartosz Golaszewski
parent 789ce0f602
commit f2c38c96d5
1 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/gpio/gpiolib-of.c
View File

@ -338,11 +338,10 @@ static void of_gpio_flags_quirks(const struct device_node *np,
*/ */
if (IS_ENABLED(CONFIG_SPI_MASTER) && !strcmp(propname, "cs-gpios") && if (IS_ENABLED(CONFIG_SPI_MASTER) && !strcmp(propname, "cs-gpios") &&
of_property_read_bool(np, "cs-gpios")) { of_property_read_bool(np, "cs-gpios")) {
struct device_node *child;
u32 cs; u32 cs;
int ret; int ret;
for_each_child_of_node(np, child) { for_each_child_of_node_scoped(np, child) {
ret = of_property_read_u32(child, "reg", &cs); ret = of_property_read_u32(child, "reg", &cs);
if (ret) if (ret)
continue; continue;
@ -363,7 +362,6 @@ static void of_gpio_flags_quirks(const struct device_node *np,
"spi-cs-high"); "spi-cs-high");
of_gpio_quirk_polarity(child, active_high, of_gpio_quirk_polarity(child, active_high,
flags); flags);
of_node_put(child);
break; break;
} }
} }
@ -836,18 +834,15 @@ static int of_gpiochip_add_hog(struct gpio_chip *chip, struct device_node *hog)
*/ */
static int of_gpiochip_scan_gpios(struct gpio_chip *chip) static int of_gpiochip_scan_gpios(struct gpio_chip *chip)
{ {
struct device_node *np;
int ret; int ret;
for_each_available_child_of_node(dev_of_node(&chip->gpiodev->dev), np) { for_each_available_child_of_node_scoped(dev_of_node(&chip->gpiodev->dev), np) {
if (!of_property_read_bool(np, "gpio-hog")) if (!of_property_read_bool(np, "gpio-hog"))
continue; continue;
ret = of_gpiochip_add_hog(chip, np); ret = of_gpiochip_add_hog(chip, np);
if (ret < 0) { if (ret < 0)
of_node_put(np);
return ret; return ret;
}
of_node_set_flag(np, OF_POPULATED); of_node_set_flag(np, OF_POPULATED);
} }