These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / drivers / power / reset / gpio-poweroff.c

diff --git a/kernel/drivers/power/reset/gpio-poweroff.c b/kernel/drivers/power/reset/gpio-poweroff.c
index e5332f1..be3d81f 100644 (file)
--- a/kernel/drivers/power/reset/gpio-poweroff.c
+++ b/kernel/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;