diff options
| author | Uwe Kleine-König <u.kleine-koenig@pengutronix.de> | 2015-05-18 22:45:06 +0200 |
|---|---|---|
| committer | Sebastian Reichel <sre@kernel.org> | 2015-05-23 20:03:30 +0200 |
| commit | a34c0a8bf8caae7a82de08dbcca2c7c11907c805 (patch) | |
| tree | e78a15892ae53803b6aac08fc63f0530de44b8b0 /drivers/power | |
| parent | b01e7c3b803e6f0498d4db0b124e3b4efb5ac728 (diff) | |
| download | linux-stable-a34c0a8bf8caae7a82de08dbcca2c7c11907c805.tar.gz linux-stable-a34c0a8bf8caae7a82de08dbcca2c7c11907c805.tar.bz2 linux-stable-a34c0a8bf8caae7a82de08dbcca2c7c11907c805.zip | |
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>
Diffstat (limited to 'drivers/power')
| -rw-r--r-- | drivers/power/reset/gpio-poweroff.c | 25 |
1 files changed, 8 insertions, 17 deletions
diff --git a/drivers/power/reset/gpio-poweroff.c b/drivers/power/reset/gpio-poweroff.c index e5332f1db8a7..be3d81ff51cc 100644 --- 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; |