[PATCH leds v2 33/50] leds: lm36274: don't iterate through children since there is only one

Marek Behún
2020-09-17T22:35:34Z

Do not use device_for_each_child_node. Since this driver works only with
once child node present, use device_get_next_child_node instead.
This also saves one level of indentation.

Signed-off-by: Marek Behún <marek.behun@nic.cz>
Cc: Dan Murphy <dmurphy@ti.com>
---
drivers/leds/leds-lm36274.c | 50 +++++++++++++++++--------------------
1 file changed, 23 insertions(+), 27 deletions(-)

diff --git a/drivers/leds/leds-lm36274.c b/drivers/leds/leds-lm36274.c
index 2569659836e8f..4282b7392f2b5 100644
--- a/drivers/leds/leds-lm36274.c
+++ b/drivers/leds/leds-lm36274.c
@@ -72,40 +72,36 @@ static int lm36274_parse_dt(struct lm36274 *chip)
char label[LED_MAX_NAME_SIZE];
struct device *dev = &chip->pdev->dev;
const char *name;
- int child_cnt;
- int ret = -EINVAL;
+ int ret;

/* There should only be 1 node */
- child_cnt = device_get_child_node_count(dev);
- if (child_cnt != 1)
+ if (device_get_child_node_count(dev) != 1)
return -EINVAL;

- device_for_each_child_node(dev, child) {
- ret = fwnode_property_read_string(child, "label", &name);
- if (ret)
- snprintf(label, sizeof(label), "%s::",
- chip->pdev->name);
- else
- snprintf(label, sizeof(label), "%s:%s", chip->pdev->name,
- name);
-
- chip->num_leds = fwnode_property_count_u32(child, "led-sources");
- if (chip->num_leds <= 0)
- return -ENODEV;
-
- ret = fwnode_property_read_u32_array(child, "led-sources",
- chip->led_sources,
- chip->num_leds);
- if (ret) {
- dev_err(dev, "led-sources property missing\n");
- return ret;
- }
-
- fwnode_property_read_string(child, "linux,default-trigger",
- &chip->led_dev.default_trigger);
+ child = device_get_next_child_node(dev, NULL);
+
+ ret = fwnode_property_read_string(child, "label", &name);
+ if (ret)
+ snprintf(label, sizeof(label), "%s::", chip->pdev->name);
+ else
+ snprintf(label, sizeof(label), "%s:%s", chip->pdev->name, name);

+ chip->num_leds = fwnode_property_count_u32(child, "led-sources");
+ if (chip->num_leds <= 0)
+ return -ENODEV;
+
+ ret = fwnode_property_read_u32_array(child, "led-sources",
+ chip->led_sources, chip->num_leds);
+ if (ret) {
+ dev_err(dev, "led-sources property missing\n");
+ return ret;
}

+ fwnode_property_read_string(child, "linux,default-trigger",
+ &chip->led_dev.default_trigger);
+
+ fwnode_handle_put(child);
+
chip->lmu_data.regmap = chip->regmap;
chip->lmu_data.max_brightness = MAX_BRIGHTNESS_11BIT;
chip->lmu_data.msb_brightness_reg = LM36274_REG_BRT_MSB;
--
2.26.2