On Mon, 04 Nov 2024, Andy Shevchenko wrote:
> Avoid using GPIOF_ACTIVE_LOW as it's deprecated and subject to remove.
>
> Signed-off-by: Andy Shevchenko <andriy.shevchenko@xxxxxxxxxxxxxxx>
> ---
> drivers/leds/leds-gpio.c | 9 ++++-----
> 1 file changed, 4 insertions(+), 5 deletions(-)
Acked-by: Lee Jones <lee@xxxxxxxxxx>
> diff --git a/drivers/leds/leds-gpio.c b/drivers/leds/leds-gpio.c
> index 0d59b0bbc002..a3428b22de3a 100644
> --- a/drivers/leds/leds-gpio.c
> +++ b/drivers/leds/leds-gpio.c
> @@ -212,7 +212,6 @@ static struct gpio_desc *gpio_led_get_gpiod(struct device *dev, int idx,
> const struct gpio_led *template)
> {
> struct gpio_desc *gpiod;
> - unsigned long flags = GPIOF_OUT_INIT_LOW;
> int ret;
>
> /*
> @@ -239,10 +238,7 @@ static struct gpio_desc *gpio_led_get_gpiod(struct device *dev, int idx,
> if (!gpio_is_valid(template->gpio))
> return ERR_PTR(-ENOENT);
>
> - if (template->active_low)
> - flags |= GPIOF_ACTIVE_LOW;
> -
> - ret = devm_gpio_request_one(dev, template->gpio, flags,
> + ret = devm_gpio_request_one(dev, template->gpio, GPIOF_OUT_INIT_LOW,
> template->name);
> if (ret < 0)
> return ERR_PTR(ret);
> @@ -251,6 +247,9 @@ static struct gpio_desc *gpio_led_get_gpiod(struct device *dev, int idx,
> if (!gpiod)
> return ERR_PTR(-EINVAL);
>
> + if (template->active_low ^ gpiod_is_active_low(gpiod))
> + gpiod_toggle_active_low(gpiod);
> +
> return gpiod;
> }
>
> --
> 2.43.0.rc1.1336.g36b5255a03ac
>
--
Lee Jones [李琼斯]
