Since 39b2bbe3d715 (gpio: add flags argument to gpiod_get*() functions)
which appeared in v3.17-rc1, the gpiod_get* functions take an additional
parameter that allows to specify direction and initial value for output.

In this case the driver cannot easily be simplified but as the flags
parameter will become mandatory soon this change is necessary
beforehand.

Signed-off-by: Uwe Kleine-König <[email protected]>
---
Hello,

this patch applies to next and is only necessary on top of b7da8c5c725c
(leds: Add ktd2692 flash LED driver) which currently sits in next.

Note I plan to make the flags parameter mandatory for 4.3. So unless
this change gets into 4.2, would it be ok to let it go in via the gpio
tree?

Best regards
Uwe

 drivers/leds/leds-ktd2692.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/leds/leds-ktd2692.c b/drivers/leds/leds-ktd2692.c
index fe05cd113b9d..2ae8c4d17ff8 100644
--- a/drivers/leds/leds-ktd2692.c
+++ b/drivers/leds/leds-ktd2692.c
@@ -295,14 +295,14 @@ static int ktd2692_parse_dt(struct ktd2692_context *led, 
struct device *dev,
        if (!dev->of_node)
                return -ENXIO;
 
-       led->ctrl_gpio = devm_gpiod_get(dev, "ctrl");
+       led->ctrl_gpio = devm_gpiod_get(dev, "ctrl", GPIOD_ASIS);
        if (IS_ERR(led->ctrl_gpio)) {
                ret = PTR_ERR(led->ctrl_gpio);
                dev_err(dev, "cannot get ctrl-gpios %d\n", ret);
                return ret;
        }
 
-       led->aux_gpio = devm_gpiod_get(dev, "aux");
+       led->aux_gpio = devm_gpiod_get(dev, "aux", GPIOD_ASIS);
        if (IS_ERR(led->aux_gpio)) {
                ret = PTR_ERR(led->aux_gpio);
                dev_err(dev, "cannot get aux-gpios %d\n", ret);
-- 
2.1.4

--
To unsubscribe from this list: send the line "unsubscribe linux-leds" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to