Commit f95fd4ac authored by Bartosz Golaszewski's avatar Bartosz Golaszewski
Browse files

gpiolib: rename static functions that are called with the lock taken 



Rename two functions that read or modify the global GPIO device list but
don't take the lock themselves (and need to be called with it already
acquired). Use the _unlocked() suffix which seems to be used quite
consistently across the kernel despite there also existing the _locked()
suffix for the same purpose.

Signed-off-by: default avatarBartosz Golaszewski <bartosz.golaszewski@linaro.org>
Reviewed-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
parent 4c7fcbf5

drivers/gpio/gpiolib.c

+4 −4
Original line number Diff line number Diff line
@@ -290,7 +290,7 @@ struct gpio_chip *gpio_device_get_chip(struct gpio_device *gdev) 
EXPORT_SYMBOL_GPL(gpio_device_get_chip);



/* dynamic allocation of GPIOs, e.g. on a hotplugged device */

static int gpiochip_find_base(int ngpio)

static int gpiochip_find_base_unlocked(int ngpio)

{

	struct gpio_device *gdev;

	int base = GPIO_DYNAMIC_BASE;
@@ -363,7 +363,7 @@ EXPORT_SYMBOL_GPL(gpiod_get_direction); 
 * Return -EBUSY if the new chip overlaps with some other chip's integer

 * space.

 */

static int gpiodev_add_to_list(struct gpio_device *gdev)

static int gpiodev_add_to_list_unlocked(struct gpio_device *gdev)

{

	struct gpio_device *prev, *next;
@@ -907,7 +907,7 @@ int gpiochip_add_data_with_key(struct gpio_chip *gc, void *data, 
	 */

	base = gc->base;

	if (base < 0) {

		base = gpiochip_find_base(gc->ngpio);

		base = gpiochip_find_base_unlocked(gc->ngpio);

		if (base < 0) {

			spin_unlock_irqrestore(&gpio_lock, flags);

			ret = base;
@@ -927,7 +927,7 @@ int gpiochip_add_data_with_key(struct gpio_chip *gc, void *data, 
	}

	gdev->base = base;



	ret = gpiodev_add_to_list(gdev);

	ret = gpiodev_add_to_list_unlocked(gdev);

	if (ret) {

		spin_unlock_irqrestore(&gpio_lock, flags);

		chip_err(gc, "GPIO integer space overlap, cannot add chip\n");