Commit fc328a7d authored by Marcelo Roberto Jimenez's avatar Marcelo Roberto Jimenez Committed by Bartosz Golaszewski
Browse files

gpio: Revert regression in sysfs-gpio (gpiolib.c) 



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

And this has supposedly been fixed in the following patches
commit 89ad556b ("gpio: Avoid using pin ranges with !PINCTRL")
commit 6dbbf846 ("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: default avatarMarcelo Roberto Jimenez <marcelo.jimenez@gmail.com>
Signed-off-by: default avatarBartosz Golaszewski <brgl@bgdev.pl>
parent 5f84e73f

drivers/gpio/gpiolib.c

+0 −10
Original line number Diff line number Diff line
@@ -1701,11 +1701,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);
@@ -1717,11 +1712,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);