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 the users who got it as wrong as I did when developing bus recovery for the R-Car I2C driver.
We get rid of two users of 'linux/gpio.h' this way :)
Only build tested due to no hardware.
Wolfram Sang (3): extcon: int3496: don't use GPIOF_* with gpiod_get_direction serial: mxs-auart: don't use GPIOF_* with gpiod_get_direction backlight: pwm_bl: don't use GPIOF_* with gpiod_get_direction
drivers/extcon/extcon-intel-int3496.c | 4 ++-- drivers/tty/serial/mxs-auart.c | 3 +-- drivers/video/backlight/pwm_bl.c | 6 +++--- 3 files changed, 6 insertions(+), 7 deletions(-)
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 --- Only build tested!
drivers/video/backlight/pwm_bl.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/video/backlight/pwm_bl.c b/drivers/video/backlight/pwm_bl.c index 1c2289ddd555a6..0fa7d2bd0e4811 100644 --- a/drivers/video/backlight/pwm_bl.c +++ b/drivers/video/backlight/pwm_bl.c @@ -301,14 +301,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");
On 14/01/18 21:07, Wolfram Sang wrote:
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
Only build tested!
drivers/video/backlight/pwm_bl.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/video/backlight/pwm_bl.c b/drivers/video/backlight/pwm_bl.c index 1c2289ddd555a6..0fa7d2bd0e4811 100644 --- a/drivers/video/backlight/pwm_bl.c +++ b/drivers/video/backlight/pwm_bl.c @@ -301,14 +301,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.*/ if (pb->enable_gpio &&
- 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.
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");
On Sun, 14 Jan 2018, Wolfram Sang wrote:
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
Only build tested!
drivers/video/backlight/pwm_bl.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
Applied with Daniel and Simon's Acks.
dri-devel@lists.freedesktop.org
-
Daniel Thompson -
Lee Jones -
Wolfram Sang