Commit dbd1c54f authored by Marc Zyngier's avatar Marc Zyngier
Browse files

gpio: Bulk conversion to generic_handle_domain_irq() 



Wherever possible, replace constructs that match either
generic_handle_irq(irq_find_mapping()) or
generic_handle_irq(irq_linear_revmap()) to a single call to
generic_handle_domain_irq().

Reviewed-by: default avatarGeert Uytterhoeven <geert+renesas@glider.be>
Acked-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Signed-off-by: default avatarMarc Zyngier <maz@kernel.org>
parent 991007ba

drivers/gpio/gpio-104-dio-48e.c

+2 −2
Original line number Diff line number Diff line
@@ -336,8 +336,8 @@ static irqreturn_t dio48e_irq_handler(int irq, void *dev_id) 
	unsigned long gpio;



	for_each_set_bit(gpio, &irq_mask, 2)

		generic_handle_irq(irq_find_mapping(chip->irq.domain,

			19 + gpio*24));

		generic_handle_domain_irq(chip->irq.domain,

					  19 + gpio*24);



	raw_spin_lock(&dio48egpio->lock);

drivers/gpio/gpio-104-idi-48.c

+2 −2
Original line number Diff line number Diff line
@@ -223,8 +223,8 @@ static irqreturn_t idi_48_irq_handler(int irq, void *dev_id) 
		for_each_set_bit(bit_num, &irq_mask, 8) {

			gpio = bit_num + boundary * 8;



			generic_handle_irq(irq_find_mapping(chip->irq.domain,

				gpio));

			generic_handle_domain_irq(chip->irq.domain,

						  gpio);

		}

	}

drivers/gpio/gpio-104-idio-16.c

+1 −1
Original line number Diff line number Diff line
@@ -208,7 +208,7 @@ static irqreturn_t idio_16_irq_handler(int irq, void *dev_id) 
	int gpio;



	for_each_set_bit(gpio, &idio16gpio->irq_mask, chip->ngpio)

		generic_handle_irq(irq_find_mapping(chip->irq.domain, gpio));

		generic_handle_domain_irq(chip->irq.domain, gpio);



	raw_spin_lock(&idio16gpio->lock);

drivers/gpio/gpio-altera.c

+5 −6
Original line number Diff line number Diff line
@@ -201,9 +201,8 @@ static void altera_gpio_irq_edge_handler(struct irq_desc *desc) 
	      (readl(mm_gc->regs + ALTERA_GPIO_EDGE_CAP) &

	      readl(mm_gc->regs + ALTERA_GPIO_IRQ_MASK)))) {

		writel(status, mm_gc->regs + ALTERA_GPIO_EDGE_CAP);

		for_each_set_bit(i, &status, mm_gc->gc.ngpio) {

			generic_handle_irq(irq_find_mapping(irqdomain, i));

		}

		for_each_set_bit(i, &status, mm_gc->gc.ngpio)

			generic_handle_domain_irq(irqdomain, i);

	}



	chained_irq_exit(chip, desc);
@@ -228,9 +227,9 @@ static void altera_gpio_irq_leveL_high_handler(struct irq_desc *desc) 
	status = readl(mm_gc->regs + ALTERA_GPIO_DATA);

	status &= readl(mm_gc->regs + ALTERA_GPIO_IRQ_MASK);



	for_each_set_bit(i, &status, mm_gc->gc.ngpio) {

		generic_handle_irq(irq_find_mapping(irqdomain, i));

	}

	for_each_set_bit(i, &status, mm_gc->gc.ngpio)

		generic_handle_domain_irq(irqdomain, i);



	chained_irq_exit(chip, desc);

}

drivers/gpio/gpio-aspeed-sgpio.c

+3 −6
Original line number Diff line number Diff line
@@ -392,7 +392,7 @@ static void aspeed_sgpio_irq_handler(struct irq_desc *desc) 
	struct gpio_chip *gc = irq_desc_get_handler_data(desc);

	struct irq_chip *ic = irq_desc_get_chip(desc);

	struct aspeed_sgpio *data = gpiochip_get_data(gc);

	unsigned int i, p, girq;

	unsigned int i, p;

	unsigned long reg;



	chained_irq_enter(ic, desc);
@@ -402,11 +402,8 @@ static void aspeed_sgpio_irq_handler(struct irq_desc *desc) 


		reg = ioread32(bank_reg(data, bank, reg_irq_status));



		for_each_set_bit(p, &reg, 32) {

			girq = irq_find_mapping(gc->irq.domain, i * 32 + p);

			generic_handle_irq(girq);

		}



		for_each_set_bit(p, &reg, 32)

			generic_handle_domain_irq(gc->irq.domain, i * 32 + p);

	}



	chained_irq_exit(ic, desc);