74d00a8c38
* properly format/comment all patches * merge debloat patches * merge Kconfig patches * merge swconfig patches * merge hotplug patches * drop 200-fix_localversion.patch - upstream * drop 222-arm_zimage_none.patch - unused * drop 252-mv_cesa_depends.patch - no longer required * drop 410-mtd-move-forward-declaration-of-struct-mtd_info.patch - unused * drop 661-fq_codel_keep_dropped_stats.patch - outdated * drop 702-phy_add_aneg_done_function.patch - upstream * drop 840-rtc7301.patch - unused * drop 841-rtc_pt7c4338.patch - upstream * drop 921-use_preinit_as_init.patch - unused * drop spio-gpio-old and gpio-mmc - unused Signed-off-by: John Crispin <john@phrozen.org>
60 lines
2 KiB
Diff
60 lines
2 KiB
Diff
From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal@milecki.pl>
|
|
Date: Mon, 6 Mar 2017 06:19:45 +0100
|
|
Subject: [PATCH] leds: gpio: use OF variant of LED registering function
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
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>
|
|
---
|
|
drivers/leds/leds-gpio.c | 12 ++++++------
|
|
1 file changed, 6 insertions(+), 6 deletions(-)
|
|
|
|
--- a/drivers/leds/leds-gpio.c
|
|
+++ b/drivers/leds/leds-gpio.c
|
|
@@ -77,7 +77,7 @@ static int gpio_blink_set(struct led_cla
|
|
|
|
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;
|
|
|
|
@@ -139,7 +139,7 @@ static int create_gpio_led(const struct
|
|
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 {
|
|
@@ -206,7 +206,7 @@ static struct gpio_leds_priv *gpio_leds_
|
|
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);
|
|
@@ -240,9 +240,9 @@ static int gpio_led_probe(struct platfor
|
|
|
|
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;
|
|
}
|