]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
backlight: pwm_bl: Don't use GPIOF_* with gpiod_get_direction
authorWolfram Sang <wsa+renesas@sang-engineering.com>
Sun, 14 Jan 2018 21:07:10 +0000 (22:07 +0100)
committerLee Jones <lee.jones@linaro.org>
Mon, 30 Apr 2018 09:50:44 +0000 (10:50 +0100)
The documentation was wrong, gpiod_get_direction() returns 0/1 instead
of the GPIOF_* flags. The docs were fixed with commit 94fc73094abe47
("gpio: correct docs about return value of gpiod_get_direction"). Now,
fix this user (until a better, system-wide solution is in place).

Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
Acked-by: Daniel Thompson <daniel.thompson@linaro.org>
Reviewed-by: Simon Horman <horms+renesas@verge.net.au>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
drivers/video/backlight/pwm_bl.c

index 8e3f1245f5c572e1c5c7f3b17d44ae3c85500b6c..44ac5bde4e9d1ad6a39e32c57d3350ffe0bdd8ab 100644 (file)
@@ -321,14 +321,14 @@ static int pwm_backlight_probe(struct platform_device *pdev)
 
        /*
         * If the GPIO is not known to be already configured as output, that
-        * is, if gpiod_get_direction returns either GPIOF_DIR_IN or -EINVAL,
-        * change the direction to output and set the GPIO as active.
+        * is, if gpiod_get_direction returns either 1 or -EINVAL, change the
+        * direction to output and set the GPIO as active.
         * Do not force the GPIO to active when it was already output as it
         * could cause backlight flickering or we would enable the backlight too
         * early. Leave the decision of the initial backlight state for later.
         */
        if (pb->enable_gpio &&
-           gpiod_get_direction(pb->enable_gpio) != GPIOF_DIR_OUT)
+           gpiod_get_direction(pb->enable_gpio) != 0)
                gpiod_direction_output(pb->enable_gpio, 1);
 
        pb->power_supply = devm_regulator_get(&pdev->dev, "power");