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

Commit d74be6df authored by Alexandre Courbot's avatar Alexandre Courbot Committed by Linus Walleij
Browse files

gpio: remove gpiod_lock/unlock_as_irq() 



gpio_lock/unlock_as_irq() are working with (chip, offset) arguments and
are thus not using the old integer namespace. Therefore, there is no
reason to have gpiod variants of these functions working with
descriptors, especially since the (chip, offset) tuple is more suitable
to the users of these functions (GPIO drivers, whereas GPIO descriptors
are targeted at GPIO consumers).

Signed-off-by: default avatarAlexandre Courbot <acourbot@nvidia.com>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent 1bd6b601

Documentation/gpio/driver.txt

+2 −2
Original line number Diff line number Diff line
@@ -157,12 +157,12 @@ Locking IRQ usage 
Input GPIOs can be used as IRQ signals. When this happens, a driver is requested

to mark the GPIO as being used as an IRQ:



	int gpiod_lock_as_irq(struct gpio_desc *desc)

	int gpio_lock_as_irq(struct gpio_chip *chip, unsigned int offset)



This will prevent the use of non-irq related GPIO APIs until the GPIO IRQ lock

is released:



	void gpiod_unlock_as_irq(struct gpio_desc *desc)

	void gpio_unlock_as_irq(struct gpio_chip *chip, unsigned int offset)



When implementing an irqchip inside a GPIO driver, these two functions should

typically be called in the .startup() and .shutdown() callbacks from the

drivers/gpio/gpiolib-acpi.c

+3 −3
Original line number Diff line number Diff line
@@ -157,7 +157,7 @@ static acpi_status acpi_gpiochip_request_interrupt(struct acpi_resource *ares, 


	gpiod_direction_input(desc);



	ret = gpiod_lock_as_irq(desc);

	ret = gpio_lock_as_irq(chip, pin);

	if (ret) {

		dev_err(chip->dev, "Failed to lock GPIO as interrupt\n");

		goto fail_free_desc;
@@ -212,7 +212,7 @@ static acpi_status acpi_gpiochip_request_interrupt(struct acpi_resource *ares, 
fail_free_event:

	kfree(event);

fail_unlock_irq:

	gpiod_unlock_as_irq(desc);

	gpio_unlock_as_irq(chip, pin);

fail_free_desc:

	gpiochip_free_own_desc(desc);
@@ -263,7 +263,7 @@ static void acpi_gpiochip_free_interrupts(struct acpi_gpio_chip *acpi_gpio) 
		desc = gpiochip_get_desc(chip, event->pin);

		if (WARN_ON(IS_ERR(desc)))

			continue;

		gpiod_unlock_as_irq(desc);

		gpio_unlock_as_irq(chip, event->pin);

		gpiochip_free_own_desc(desc);

		list_del(&event->node);

		kfree(event);

drivers/gpio/gpiolib-legacy.c

+0 −12
Original line number Diff line number Diff line
@@ -100,15 +100,3 @@ void gpio_free_array(const struct gpio *array, size_t num) 
		gpio_free((array++)->gpio);

}

EXPORT_SYMBOL_GPL(gpio_free_array);
 


int gpio_lock_as_irq(struct gpio_chip *chip, unsigned int offset)

{

	return gpiod_lock_as_irq(gpiochip_get_desc(chip, offset));

}

EXPORT_SYMBOL_GPL(gpio_lock_as_irq);



void gpio_unlock_as_irq(struct gpio_chip *chip, unsigned int offset)

{

	return gpiod_unlock_as_irq(gpiochip_get_desc(chip, offset));

}

EXPORT_SYMBOL_GPL(gpio_unlock_as_irq);

drivers/gpio/gpiolib-sysfs.c

+2 −2
Original line number Diff line number Diff line
@@ -161,7 +161,7 @@ static int gpio_setup_irq(struct gpio_desc *desc, struct device *dev, 
	desc->flags &= ~GPIO_TRIGGER_MASK;



	if (!gpio_flags) {

		gpiod_unlock_as_irq(desc);

		gpio_unlock_as_irq(desc->chip, gpio_chip_hwgpio(desc));

		ret = 0;

		goto free_id;

	}
@@ -200,7 +200,7 @@ static int gpio_setup_irq(struct gpio_desc *desc, struct device *dev, 
	if (ret < 0)

		goto free_id;



	ret = gpiod_lock_as_irq(desc);

	ret = gpio_lock_as_irq(desc->chip, gpio_chip_hwgpio(desc));

	if (ret < 0) {

		gpiod_warn(desc, "failed to flag the GPIO for IRQ\n");

		goto free_id;

drivers/gpio/gpiolib.c

+16 −14
Original line number Diff line number Diff line
@@ -1428,44 +1428,46 @@ int gpiod_to_irq(const struct gpio_desc *desc) 
EXPORT_SYMBOL_GPL(gpiod_to_irq);



/**

 * gpiod_lock_as_irq() - lock a GPIO to be used as IRQ

 * @gpio: the GPIO line to lock as used for IRQ

 * gpio_lock_as_irq() - lock a GPIO to be used as IRQ

 * @chip: the chip the GPIO to lock belongs to

 * @offset: the offset of the GPIO to lock as IRQ

 *

 * This is used directly by GPIO drivers that want to lock down

 * a certain GPIO line to be used for IRQs.

 */

int gpiod_lock_as_irq(struct gpio_desc *desc)

int gpio_lock_as_irq(struct gpio_chip *chip, unsigned int offset)

{

	if (!desc)

	if (offset >= chip->ngpio)

		return -EINVAL;



	if (test_bit(FLAG_IS_OUT, &desc->flags)) {

		gpiod_err(desc,

	if (test_bit(FLAG_IS_OUT, &chip->desc[offset].flags)) {

		chip_err(chip,

			  "%s: tried to flag a GPIO set as output for IRQ\n",

			  __func__);

		return -EIO;

	}



	set_bit(FLAG_USED_AS_IRQ, &desc->flags);

	set_bit(FLAG_USED_AS_IRQ, &chip->desc[offset].flags);

	return 0;

}

EXPORT_SYMBOL_GPL(gpiod_lock_as_irq);

EXPORT_SYMBOL_GPL(gpio_lock_as_irq);



/**

 * gpiod_unlock_as_irq() - unlock a GPIO used as IRQ

 * @gpio: the GPIO line to unlock from IRQ usage

 * gpio_unlock_as_irq() - unlock a GPIO used as IRQ

 * @chip: the chip the GPIO to lock belongs to

 * @offset: the offset of the GPIO to lock as IRQ

 *

 * This is used directly by GPIO drivers that want to indicate

 * that a certain GPIO is no longer used exclusively for IRQ.

 */

void gpiod_unlock_as_irq(struct gpio_desc *desc)

void gpio_unlock_as_irq(struct gpio_chip *chip, unsigned int offset)

{

	if (!desc)

	if (offset >= chip->ngpio)

		return;



	clear_bit(FLAG_USED_AS_IRQ, &desc->flags);

	clear_bit(FLAG_USED_AS_IRQ, &chip->desc[offset].flags);

}

EXPORT_SYMBOL_GPL(gpiod_unlock_as_irq);

EXPORT_SYMBOL_GPL(gpio_unlock_as_irq);



/**

 * gpiod_get_raw_value_cansleep() - return a gpio's raw value