Skip to content

Commit

Permalink
leds: gpio: use OF variant of LED registering function
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Rafał Miłecki authored and Jacek Anaszewski committed Mar 8, 2017
1 parent 442c609 commit 7ea79ae
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions drivers/leds/leds-gpio.c
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ 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,
gpio_blink_set_t blink_set)
struct device_node *np, gpio_blink_set_t blink_set)
{
int ret, state;

Expand Down Expand Up @@ -139,7 +139,7 @@ static int create_gpio_led(const struct gpio_led *template,
if (ret < 0)
return ret;

return devm_led_classdev_register(parent, &led_dat->cdev);
return devm_of_led_classdev_register(parent, np, &led_dat->cdev);
}

struct gpio_leds_priv {
Expand Down Expand Up @@ -208,7 +208,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, NULL);
ret = create_gpio_led(&led, led_dat, dev, np, NULL);
if (ret < 0) {
fwnode_handle_put(child);
return ERR_PTR(ret);
Expand Down Expand Up @@ -242,9 +242,9 @@ static int gpio_led_probe(struct platform_device *pdev)

priv->num_leds = pdata->num_leds;
for (i = 0; i < priv->num_leds; i++) {
ret = create_gpio_led(&pdata->leds[i],
&priv->leds[i],
&pdev->dev, pdata->gpio_blink_set);
ret = create_gpio_led(&pdata->leds[i], &priv->leds[i],
&pdev->dev, NULL,
pdata->gpio_blink_set);
if (ret < 0)
return ret;
}
Expand Down

0 comments on commit 7ea79ae

Please sign in to comment.