[PATCH RESEND] backlight: pwm_bl: don't use GPIOF_* with gpiod_get_direction

Simon Horman horms at verge.net.au
Wed Apr 11 07:32:16 UTC 2018


On Tue, Apr 10, 2018 at 02:32:40PM +0200, 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 at sang-engineering.com>
> Acked-by: Daniel Thompson <daniel.thompson at linaro.org>

Reviewed-by: Simon Horman <horms+renesas at verge.net.au>

> ---
> 
> Changes since V1:
> 	* rebased to top-of-linus-tree
> 	* added tag from Daniel, thanks!
> 
> Through which tree does this need to go?
> 
>  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 1c2289ddd555..0fa7d2bd0e48 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");
> -- 
> 2.11.0
> 


More information about the dri-devel mailing list