Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 426577bd authored by Johan Hovold's avatar Johan Hovold Committed by Linus Walleij
Browse files

gpio: sysfs: rename gpiochip registration functions 



Rename the gpio-chip export/unexport functions to the more descriptive
names gpiochip_sysfs_register and gpiochip_sysfs_unregister.

Signed-off-by: default avatarJohan Hovold <johan@kernel.org>
Reviewed-by: default avatarAlexandre Courbot <acourbot@nvidia.com>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent 6a4b6b0a

drivers/gpio/gpiolib-sysfs.c

+9 −7
Original line number Diff line number Diff line
@@ -765,13 +765,14 @@ void gpiod_unexport(struct gpio_desc *desc) 
}

EXPORT_SYMBOL_GPL(gpiod_unexport);



int gpiochip_export(struct gpio_chip *chip)

int gpiochip_sysfs_register(struct gpio_chip *chip)

{

	struct device	*dev;



	/* Many systems register gpio chips for SOC support very early,

	/*

	 * Many systems add gpio chips for SOC support very early,

	 * before driver model support is available.  In those cases we

	 * export this later, in gpiolib_sysfs_init() ... here we just

	 * register later, in gpiolib_sysfs_init() ... here we just

	 * verify that _some_ field of gpio_class got initialized.

	 */

	if (!gpio_class.p)
@@ -791,7 +792,7 @@ int gpiochip_export(struct gpio_chip *chip) 
	return 0;

}



void gpiochip_unexport(struct gpio_chip *chip)

void gpiochip_sysfs_unregister(struct gpio_chip *chip)

{

	struct gpio_desc *desc;

	unsigned int i;
@@ -836,15 +837,16 @@ static int __init gpiolib_sysfs_init(void) 
			continue;



		/*

		 * TODO we yield gpio_lock here because gpiochip_export()

		 * acquires a mutex. This is unsafe and needs to be fixed.

		 * TODO we yield gpio_lock here because

		 * gpiochip_sysfs_register() acquires a mutex. This is unsafe

		 * and needs to be fixed.

		 *

		 * Also it would be nice to use gpiochip_find() here so we

		 * can keep gpio_chips local to gpiolib.c, but the yield of

		 * gpio_lock prevents us from doing this.

		 */

		spin_unlock_irqrestore(&gpio_lock, flags);

		status = gpiochip_export(chip);

		status = gpiochip_sysfs_register(chip);

		spin_lock_irqsave(&gpio_lock, flags);

	}

	spin_unlock_irqrestore(&gpio_lock, flags);

drivers/gpio/gpiolib.c

+2 −2
Original line number Diff line number Diff line
@@ -285,7 +285,7 @@ int gpiochip_add(struct gpio_chip *chip) 
	of_gpiochip_add(chip);

	acpi_gpiochip_add(chip);



	status = gpiochip_export(chip);

	status = gpiochip_sysfs_register(chip);

	if (status)

		goto err_remove_chip;
@@ -330,7 +330,7 @@ void gpiochip_remove(struct gpio_chip *chip) 
	unsigned	id;

	bool		requested = false;



	gpiochip_unexport(chip);

	gpiochip_sysfs_unregister(chip);



	gpiochip_irqchip_remove(chip);

drivers/gpio/gpiolib.h

+4 −4
Original line number Diff line number Diff line
@@ -151,17 +151,17 @@ static int __maybe_unused gpio_chip_hwgpio(const struct gpio_desc *desc) 


#ifdef CONFIG_GPIO_SYSFS



int gpiochip_export(struct gpio_chip *chip);

void gpiochip_unexport(struct gpio_chip *chip);

int gpiochip_sysfs_register(struct gpio_chip *chip);

void gpiochip_sysfs_unregister(struct gpio_chip *chip);



#else



static inline int gpiochip_export(struct gpio_chip *chip)

static inline int gpiochip_sysfs_register(struct gpio_chip *chip)

{

	return 0;

}



static inline void gpiochip_unexport(struct gpio_chip *chip)

static inline void gpiochip_sysfs_unregister(struct gpio_chip *chip)

{

}