leds: gpio: Use generic support for composing LED names (d7235f5f) · Commits · 戴 / test

drivers/leds/leds-gpio.c

+13 −13

Original line number	Diff line number	Diff line
		@@ -73,11 +73,11 @@ static int gpio_blink_set(struct led_classdev *led_cdev,

		static int create_gpio_led(const struct gpio_led *template,
		struct gpio_led_data led_dat, struct device parent,
		struct device_node *np, gpio_blink_set_t blink_set)
		struct fwnode_handle *fwnode, gpio_blink_set_t blink_set)
		{
		struct led_init_data init_data = {};
		int ret, state;

		led_dat->cdev.name = template->name;
		led_dat->cdev.default_trigger = template->default_trigger;
		led_dat->can_sleep = gpiod_cansleep(led_dat->gpiod);
		if (!led_dat->can_sleep)
		@@ -108,7 +108,16 @@ static int create_gpio_led(const struct gpio_led *template,
		if (ret < 0)
		return ret;

		return devm_led_classdev_register(parent, &led_dat->cdev);
		if (template->name) {
		led_dat->cdev.name = template->name;
		ret = devm_led_classdev_register(parent, &led_dat->cdev);
		} else {
		init_data.fwnode = fwnode;
		ret = devm_led_classdev_register_ext(parent, &led_dat->cdev,
		&init_data);
		}

		return ret;
		}

		struct gpio_leds_priv {
		@@ -141,15 +150,6 @@ static struct gpio_leds_priv gpio_leds_create(struct platform_device pdev)
		struct gpio_led_data *led_dat = &priv->leds[priv->num_leds];
		struct gpio_led led = {};
		const char *state = NULL;
		struct device_node *np = to_of_node(child);

		ret = fwnode_property_read_string(child, "label", &led.name);
		if (ret && IS_ENABLED(CONFIG_OF) && np)
		led.name = np->name;
		if (!led.name) {
		fwnode_handle_put(child);
		return ERR_PTR(-EINVAL);
		}

		led.gpiod = devm_fwnode_get_gpiod_from_child(dev, NULL, child,
		GPIOD_ASIS,
		@@ -181,7 +181,7 @@ static struct gpio_leds_priv gpio_leds_create(struct platform_device pdev)
		if (fwnode_property_present(child, "panic-indicator"))
		led.panic_indicator = 1;

		ret = create_gpio_led(&led, led_dat, dev, np, NULL);
		ret = create_gpio_led(&led, led_dat, dev, child, NULL);
		if (ret < 0) {
		fwnode_handle_put(child);
		return ERR_PTR(ret);

Admin message