lkml.org 
[lkml]   [2022]   [Mar]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 5.16 11/13] gpio: Revert regression in sysfs-gpio (gpiolib.c)
    Date
    From: Marcelo Roberto Jimenez <marcelo.jimenez@gmail.com>

    [ Upstream commit fc328a7d1fcce263db0b046917a66f3aa6e68719 ]

    Some GPIO lines have stopped working after the patch
    commit 2ab73c6d8323f ("gpio: Support GPIO controllers without pin-ranges")

    And this has supposedly been fixed in the following patches
    commit 89ad556b7f96a ("gpio: Avoid using pin ranges with !PINCTRL")
    commit 6dbbf84603961 ("gpiolib: Don't free if pin ranges are not defined")

    But an erratic behavior where some GPIO lines work while others do not work
    has been introduced.

    This patch reverts those changes so that the sysfs-gpio interface works
    properly again.

    Signed-off-by: Marcelo Roberto Jimenez <marcelo.jimenez@gmail.com>
    Signed-off-by: Bartosz Golaszewski <brgl@bgdev.pl>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/gpio/gpiolib.c | 10 ----------
    1 file changed, 10 deletions(-)

    diff --git a/drivers/gpio/gpiolib.c b/drivers/gpio/gpiolib.c
    index abfbf546d159..9b8ed72062d1 100644
    --- a/drivers/gpio/gpiolib.c
    +++ b/drivers/gpio/gpiolib.c
    @@ -1665,11 +1665,6 @@ static inline void gpiochip_irqchip_free_valid_mask(struct gpio_chip *gc)
    */
    int gpiochip_generic_request(struct gpio_chip *gc, unsigned int offset)
    {
    -#ifdef CONFIG_PINCTRL
    - if (list_empty(&gc->gpiodev->pin_ranges))
    - return 0;
    -#endif
    -
    return pinctrl_gpio_request(gc->gpiodev->base + offset);
    }
    EXPORT_SYMBOL_GPL(gpiochip_generic_request);
    @@ -1681,11 +1676,6 @@ EXPORT_SYMBOL_GPL(gpiochip_generic_request);
    */
    void gpiochip_generic_free(struct gpio_chip *gc, unsigned int offset)
    {
    -#ifdef CONFIG_PINCTRL
    - if (list_empty(&gc->gpiodev->pin_ranges))
    - return;
    -#endif
    -
    pinctrl_gpio_free(gc->gpiodev->base + offset);
    }
    EXPORT_SYMBOL_GPL(gpiochip_generic_free);
    --
    2.34.1
    \
     
     \ /
      Last update: 2022-03-16 15:18    [W:3.710 / U:0.096 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site