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

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

gpio: rename gpio_lock_as_irq to gpiochip_lock_as_irq 



This function actually operates on a gpio_chip, so its prefix should
reflect that fact for consistency with other functions defined in
gpio/driver.h.

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

Documentation/gpio/driver.txt

+2 −2
Original line number Diff line number Diff line
@@ -158,12 +158,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 gpio_lock_as_irq(struct gpio_chip *chip, unsigned int offset)

	int gpiochip_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 gpio_unlock_as_irq(struct gpio_chip *chip, unsigned int offset)

	void gpiochip_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/gpio-bcm-kona.c

+2 −2
Original line number Diff line number Diff line
@@ -470,7 +470,7 @@ static int bcm_kona_gpio_irq_reqres(struct irq_data *d) 
{

	struct bcm_kona_gpio *kona_gpio = irq_data_get_irq_chip_data(d);



	if (gpio_lock_as_irq(&kona_gpio->gpio_chip, d->hwirq)) {

	if (gpiochip_lock_as_irq(&kona_gpio->gpio_chip, d->hwirq)) {

		dev_err(kona_gpio->gpio_chip.dev,

			"unable to lock HW IRQ %lu for IRQ\n",

			d->hwirq);
@@ -483,7 +483,7 @@ static void bcm_kona_gpio_irq_relres(struct irq_data *d) 
{

	struct bcm_kona_gpio *kona_gpio = irq_data_get_irq_chip_data(d);



	gpio_unlock_as_irq(&kona_gpio->gpio_chip, d->hwirq);

	gpiochip_unlock_as_irq(&kona_gpio->gpio_chip, d->hwirq);

}



static struct irq_chip bcm_gpio_irq_chip = {

drivers/gpio/gpio-dwapb.c

+2 −2
Original line number Diff line number Diff line
@@ -194,7 +194,7 @@ static int dwapb_irq_reqres(struct irq_data *d) 
	struct dwapb_gpio *gpio = igc->private;

	struct bgpio_chip *bgc = &gpio->ports[0].bgc;



	if (gpio_lock_as_irq(&bgc->gc, irqd_to_hwirq(d))) {

	if (gpiochip_lock_as_irq(&bgc->gc, irqd_to_hwirq(d))) {

		dev_err(gpio->dev, "unable to lock HW IRQ %lu for IRQ\n",

			irqd_to_hwirq(d));

		return -EINVAL;
@@ -208,7 +208,7 @@ static void dwapb_irq_relres(struct irq_data *d) 
	struct dwapb_gpio *gpio = igc->private;

	struct bgpio_chip *bgc = &gpio->ports[0].bgc;



	gpio_unlock_as_irq(&bgc->gc, irqd_to_hwirq(d));

	gpiochip_unlock_as_irq(&bgc->gc, irqd_to_hwirq(d));

}



static int dwapb_irq_set_type(struct irq_data *d, u32 type)

drivers/gpio/gpio-em.c

+2 −2
Original line number Diff line number Diff line
@@ -103,7 +103,7 @@ static int em_gio_irq_reqres(struct irq_data *d) 
{

	struct em_gio_priv *p = irq_data_get_irq_chip_data(d);



	if (gpio_lock_as_irq(&p->gpio_chip, irqd_to_hwirq(d))) {

	if (gpiochip_lock_as_irq(&p->gpio_chip, irqd_to_hwirq(d))) {

		dev_err(p->gpio_chip.dev,

			"unable to lock HW IRQ %lu for IRQ\n",

			irqd_to_hwirq(d));
@@ -116,7 +116,7 @@ static void em_gio_irq_relres(struct irq_data *d) 
{

	struct em_gio_priv *p = irq_data_get_irq_chip_data(d);



	gpio_unlock_as_irq(&p->gpio_chip, irqd_to_hwirq(d));

	gpiochip_unlock_as_irq(&p->gpio_chip, irqd_to_hwirq(d));

}

drivers/gpio/gpio-mcp23s08.c

+2 −2
Original line number Diff line number Diff line
@@ -444,7 +444,7 @@ static int mcp23s08_irq_reqres(struct irq_data *data) 
{

	struct mcp23s08 *mcp = irq_data_get_irq_chip_data(data);



	if (gpio_lock_as_irq(&mcp->chip, data->hwirq)) {

	if (gpiochip_lock_as_irq(&mcp->chip, data->hwirq)) {

		dev_err(mcp->chip.dev,

			"unable to lock HW IRQ %lu for IRQ usage\n",

			data->hwirq);
@@ -458,7 +458,7 @@ static void mcp23s08_irq_relres(struct irq_data *data) 
{

	struct mcp23s08 *mcp = irq_data_get_irq_chip_data(data);



	gpio_unlock_as_irq(&mcp->chip, data->hwirq);

	gpiochip_unlock_as_irq(&mcp->chip, data->hwirq);

}



static struct irq_chip mcp23s08_irq_chip = {