Commit 80c78fbe authored by Andy Shevchenko's avatar Andy Shevchenko Committed by Bartosz Golaszewski
Browse files

gpiolib: Introduce for_each_gpio_desc_with_flag() macro 



In a few places we are using a loop against all GPIO descriptors
with a given flag for a given device. Replace it with a consolidated
for_each type of macro.

Signed-off-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Reviewed-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Signed-off-by: default avatarBartosz Golaszewski <brgl@bgdev.pl>
parent 0868ad38

drivers/gpio/gpiolib-of.c

+4 −6
Original line number Diff line number Diff line
@@ -711,14 +711,12 @@ static int of_gpiochip_scan_gpios(struct gpio_chip *chip) 
static void of_gpiochip_remove_hog(struct gpio_chip *chip,

				   struct device_node *hog)

{

	struct gpio_desc *descs = chip->gpiodev->descs;

	struct gpio_desc *desc;

	unsigned int i;



	for (i = 0; i < chip->ngpio; i++) {

		if (test_bit(FLAG_IS_HOGGED, &descs[i].flags) &&

		    descs[i].hog == hog)

			gpiochip_free_own_desc(&descs[i]);

	}

	for_each_gpio_desc_with_flag(i, chip, desc, FLAG_IS_HOGGED)

		if (desc->hog == hog)

			gpiochip_free_own_desc(desc);

}



static int of_gpiochip_match_node(struct gpio_chip *chip, void *data)

drivers/gpio/gpiolib-sysfs.c

+2 −5
Original line number Diff line number Diff line
@@ -793,12 +793,9 @@ void gpiochip_sysfs_unregister(struct gpio_device *gdev) 
	mutex_unlock(&sysfs_lock);



	/* unregister gpiod class devices owned by sysfs */

	for (i = 0; i < chip->ngpio; i++) {

		desc = &gdev->descs[i];

		if (test_and_clear_bit(FLAG_SYSFS, &desc->flags))

	for_each_gpio_desc_with_flag(i, chip, desc, FLAG_SYSFS)

		gpiod_free(desc);

}

}



static int __init gpiolib_sysfs_init(void)

{

drivers/gpio/gpiolib.c

+3 −4
Original line number Diff line number Diff line
@@ -4102,12 +4102,11 @@ int gpiod_hog(struct gpio_desc *desc, const char *name, 
 */

static void gpiochip_free_hogs(struct gpio_chip *gc)

{

	struct gpio_desc *desc;

	int id;



	for (id = 0; id < gc->ngpio; id++) {

		if (test_bit(FLAG_IS_HOGGED, &gc->gpiodev->descs[id].flags))

			gpiochip_free_own_desc(&gc->gpiodev->descs[id]);

	}

	for_each_gpio_desc_with_flag(id, gc, desc, FLAG_IS_HOGGED)

		gpiochip_free_own_desc(desc);

}



/**

drivers/gpio/gpiolib.h

+7 −0
Original line number Diff line number Diff line
@@ -82,6 +82,13 @@ struct gpio_array { 
};



struct gpio_desc *gpiochip_get_desc(struct gpio_chip *gc, unsigned int hwnum);



#define for_each_gpio_desc_with_flag(i, gc, desc, flag)		\

	for (i = 0, desc = gpiochip_get_desc(gc, i);		\

	     i < gc->ngpio;					\

	     i++, desc = gpiochip_get_desc(gc, i))		\

		if (!test_bit(flag, &desc->flags)) {} else



int gpiod_get_array_value_complex(bool raw, bool can_sleep,

				  unsigned int array_size,

				  struct gpio_desc **desc_array,