power: reset: gpio-poweroff: let devm_gpiod_get set direction of gpio

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.

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Sebastian Reichel <sre@kernel.org>

diff --git a/drivers/power/reset/gpio-poweroff.c b/drivers/power/reset/gpio-poweroff.c
index e5332f1db8a792128d04bf067561fdd6efa07c12..be3d81ff51cc3f510d85e4eed7a52960e51e7bc1 100644 (file)
--- a/drivers/power/reset/gpio-poweroff.c
+++ b/drivers/power/reset/gpio-poweroff.c
@@ -48,6 +48,7 @@ static void gpio_poweroff_do_poweroff(void)
 static int gpio_poweroff_probe(struct platform_device *pdev)
 {
        bool input = false;
+       enum gpiod_flags flags;
 
        /* If a pm_power_off function has already been added, leave it alone */
        if (pm_power_off != NULL) {
@@ -57,25 +58,15 @@ static int gpio_poweroff_probe(struct platform_device *pdev)
                return -EBUSY;
        }
 
-       reset_gpio = devm_gpiod_get(&pdev->dev, NULL);
-       if (IS_ERR(reset_gpio))
-               return PTR_ERR(reset_gpio);
-
        input = of_property_read_bool(pdev->dev.of_node, "input");
+       if (input)
+               flags = GPIOD_IN;
+       else
+               flags = GPIOD_OUT_LOW;
 
-       if (input) {
-               if (gpiod_direction_input(reset_gpio)) {
-                       dev_err(&pdev->dev,
-                               "Could not set direction of reset GPIO to input\n");
-                       return -ENODEV;
-               }
-       } else {
-               if (gpiod_direction_output(reset_gpio, 0)) {
-                       dev_err(&pdev->dev,
-                               "Could not set direction of reset GPIO\n");
-                       return -ENODEV;
-               }
-       }
+       reset_gpio = devm_gpiod_get(&pdev->dev, NULL, flags);
+       if (IS_ERR(reset_gpio))
+               return PTR_ERR(reset_gpio);
 
        pm_power_off = &gpio_poweroff_do_poweroff;
        return 0;