leds: gpio: fix and simplify reading property "label" (bec69de8) · Commits · 戴 / test

Checking for the presence of the property first isn't strictly needed as we can react on the return code of fwnode_property_read_string. Also, even if the presence of a property "label" was checked, reading a string value for it theoretically still can fail and this case isn't handled. Signed-off-by:

Heiner Kallweit <hkallweit1@gmail.com> Signed-off-by:

Jacek Anaszewski <j.anaszewski@samsung.com>

drivers/leds/leds-gpio.c

+7 −9

Original line number	Diff line number	Diff line
		@@ -181,16 +181,14 @@ static struct gpio_leds_priv gpio_leds_create(struct platform_device pdev)
		goto err;
		}

		if (fwnode_property_present(child, "label")) {
		fwnode_property_read_string(child, "label", &led.name);
		} else {
		if (IS_ENABLED(CONFIG_OF) && !led.name && np)
		ret = fwnode_property_read_string(child, "label", &led.name);
		if (ret && IS_ENABLED(CONFIG_OF) && np)
		led.name = np->name;
		if (!led.name) {
		ret = -EINVAL;
		goto err;
		}
		}

		fwnode_property_read_string(child, "linux,default-trigger",
		&led.default_trigger);

Admin message