diff options
author | Rafał Miłecki <rafal@milecki.pl> | 2017-03-06 00:19:45 -0500 |
---|---|---|
committer | Jacek Anaszewski <jacek.anaszewski@gmail.com> | 2017-03-08 15:10:02 -0500 |
commit | 7ea79ae86c28e729d51fa5703b093d27cca25217 (patch) | |
tree | 5da0a6911c9e78b00c152feb6170450f56cd63a0 | |
parent | 442c609830e98919faa78b797e9b89c53bab9cbf (diff) |
leds: gpio: use OF variant of LED registering function
In leds-gpio we support LEDs specified in DT so we should use
(devm_)of_led_classdev_register. This allows passing DT node as argument
for use by the LED subsystem.
Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
Acked-by: Pavel Machek <pavel@ucw.cz>
Signed-off-by: Jacek Anaszewski <jacek.anaszewski@gmail.com>
-rw-r--r-- | drivers/leds/leds-gpio.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/leds/leds-gpio.c b/drivers/leds/leds-gpio.c index 066fc7590729..e753ba93ba1e 100644 --- a/drivers/leds/leds-gpio.c +++ b/drivers/leds/leds-gpio.c | |||
@@ -77,7 +77,7 @@ static int gpio_blink_set(struct led_classdev *led_cdev, | |||
77 | 77 | ||
78 | static int create_gpio_led(const struct gpio_led *template, | 78 | static int create_gpio_led(const struct gpio_led *template, |
79 | struct gpio_led_data *led_dat, struct device *parent, | 79 | struct gpio_led_data *led_dat, struct device *parent, |
80 | gpio_blink_set_t blink_set) | 80 | struct device_node *np, gpio_blink_set_t blink_set) |
81 | { | 81 | { |
82 | int ret, state; | 82 | int ret, state; |
83 | 83 | ||
@@ -139,7 +139,7 @@ static int create_gpio_led(const struct gpio_led *template, | |||
139 | if (ret < 0) | 139 | if (ret < 0) |
140 | return ret; | 140 | return ret; |
141 | 141 | ||
142 | return devm_led_classdev_register(parent, &led_dat->cdev); | 142 | return devm_of_led_classdev_register(parent, np, &led_dat->cdev); |
143 | } | 143 | } |
144 | 144 | ||
145 | struct gpio_leds_priv { | 145 | struct gpio_leds_priv { |
@@ -208,7 +208,7 @@ static struct gpio_leds_priv *gpio_leds_create(struct platform_device *pdev) | |||
208 | if (fwnode_property_present(child, "panic-indicator")) | 208 | if (fwnode_property_present(child, "panic-indicator")) |
209 | led.panic_indicator = 1; | 209 | led.panic_indicator = 1; |
210 | 210 | ||
211 | ret = create_gpio_led(&led, led_dat, dev, NULL); | 211 | ret = create_gpio_led(&led, led_dat, dev, np, NULL); |
212 | if (ret < 0) { | 212 | if (ret < 0) { |
213 | fwnode_handle_put(child); | 213 | fwnode_handle_put(child); |
214 | return ERR_PTR(ret); | 214 | return ERR_PTR(ret); |
@@ -242,9 +242,9 @@ static int gpio_led_probe(struct platform_device *pdev) | |||
242 | 242 | ||
243 | priv->num_leds = pdata->num_leds; | 243 | priv->num_leds = pdata->num_leds; |
244 | for (i = 0; i < priv->num_leds; i++) { | 244 | for (i = 0; i < priv->num_leds; i++) { |
245 | ret = create_gpio_led(&pdata->leds[i], | 245 | ret = create_gpio_led(&pdata->leds[i], &priv->leds[i], |
246 | &priv->leds[i], | 246 | &pdev->dev, NULL, |
247 | &pdev->dev, pdata->gpio_blink_set); | 247 | pdata->gpio_blink_set); |
248 | if (ret < 0) | 248 | if (ret < 0) |
249 | return ret; | 249 | return ret; |
250 | } | 250 | } |