leds: leds-gpio: Make use of device property API (a43f2cbb) · Commits · 戴 / test

drivers/leds/leds-gpio.c

+26 −37

Original line number	Diff line number	Diff line
		@@ -16,10 +16,8 @@
		#include <linux/kernel.h>
		#include <linux/leds.h>
		#include <linux/module.h>
		#include <linux/of.h>
		#include <linux/of_gpio.h>
		#include <linux/of_platform.h>
		#include <linux/platform_device.h>
		#include <linux/property.h>
		#include <linux/slab.h>
		#include <linux/workqueue.h>

		@@ -171,40 +169,37 @@ static inline int sizeof_gpio_leds_priv(int num_leds)
		(sizeof(struct gpio_led_data) * num_leds);
		}

		/* Code to create from OpenFirmware platform devices */
		#ifdef CONFIG_OF_GPIO
		static struct gpio_leds_priv gpio_leds_create_of(struct platform_device pdev)
		static struct gpio_leds_priv gpio_leds_create(struct platform_device pdev)
		{
		struct device_node np = pdev->dev.of_node, child;
		struct device *dev = &pdev->dev;
		struct fwnode_handle *child;
		struct gpio_leds_priv *priv;
		int count, ret;

		/* count LEDs in this device, so we know how much to allocate */
		count = of_get_available_child_count(np);
		count = device_get_child_node_count(dev);
		if (!count)
		return ERR_PTR(-ENODEV);

		for_each_available_child_of_node(np, child)
		if (of_get_gpio(child, 0) == -EPROBE_DEFER)
		return ERR_PTR(-EPROBE_DEFER);

		priv = devm_kzalloc(&pdev->dev, sizeof_gpio_leds_priv(count),
		GFP_KERNEL);
		priv = devm_kzalloc(dev, sizeof_gpio_leds_priv(count), GFP_KERNEL);
		if (!priv)
		return ERR_PTR(-ENOMEM);

		for_each_available_child_of_node(np, child) {
		device_for_each_child_node(dev, child) {
		struct gpio_led led = {};
		enum of_gpio_flags flags;
		const char *state;

		led.gpio = of_get_gpio_flags(child, 0, &flags);
		led.active_low = flags & OF_GPIO_ACTIVE_LOW;
		led.name = of_get_property(child, "label", NULL) ? : child->name;
		led.default_trigger =
		of_get_property(child, "linux,default-trigger", NULL);
		state = of_get_property(child, "default-state", NULL);
		if (state) {
		const char *state = NULL;

		led.gpiod = devm_get_gpiod_from_child(dev, child);
		if (IS_ERR(led.gpiod)) {
		fwnode_handle_put(child);
		goto err;
		}

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

		if (!fwnode_property_read_string(child, "linux,default_state",
		&state)) {
		if (!strcmp(state, "keep"))
		led.default_state = LEDS_GPIO_DEFSTATE_KEEP;
		else if (!strcmp(state, "on"))
		@@ -213,13 +208,13 @@ static struct gpio_leds_priv gpio_leds_create_of(struct platform_device pdev)
		led.default_state = LEDS_GPIO_DEFSTATE_OFF;
		}

		if (of_get_property(child, "retain-state-suspended", NULL))
		if (fwnode_property_present(child, "retain-state-suspended"))
		led.retain_state_suspended = 1;

		ret = create_gpio_led(&led, &priv->leds[priv->num_leds++],
		&pdev->dev, NULL);
		dev, NULL);
		if (ret < 0) {
		of_node_put(child);
		fwnode_handle_put(child);
		goto err;
		}
		}
		@@ -238,12 +233,6 @@ static const struct of_device_id of_gpio_leds_match[] = {
		};

		MODULE_DEVICE_TABLE(of, of_gpio_leds_match);
		#else /* CONFIG_OF_GPIO */
		static struct gpio_leds_priv gpio_leds_create_of(struct platform_device pdev)
		{
		return ERR_PTR(-ENODEV);
		}
		#endif /* CONFIG_OF_GPIO */

		static int gpio_led_probe(struct platform_device *pdev)
		{
		@@ -271,7 +260,7 @@ static int gpio_led_probe(struct platform_device *pdev)
		}
		}
		} else {
		priv = gpio_leds_create_of(pdev);
		priv = gpio_leds_create(pdev);
		if (IS_ERR(priv))
		return PTR_ERR(priv);
		}
		@@ -298,7 +287,7 @@ static struct platform_driver gpio_led_driver = {
		.driver = {
		.name = "leds-gpio",
		.owner = THIS_MODULE,
		.of_match_table = of_match_ptr(of_gpio_leds_match),
		.of_match_table = of_gpio_leds_match,
		},
		};

Admin message