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

Commit 23393d49 authored by Rob Herring's avatar Rob Herring Committed by Linus Walleij
Browse files

gpio: kill off set_irq_flags usage 



set_irq_flags is ARM specific with custom flags which have genirq
equivalents. Convert drivers to use the genirq interfaces directly, so we
can kill off set_irq_flags. The translation of flags is as follows:

IRQF_VALID -> !IRQ_NOREQUEST
IRQF_PROBE -> !IRQ_NOPROBE
IRQF_NOAUTOEN -> IRQ_NOAUTOEN

For IRQs managed by an irqdomain, the irqdomain core code handles clearing
and setting IRQ_NOREQUEST already, so there is no need to do this in
.map() functions and we can simply remove the set_irq_flags calls. Some
users also modify IRQ_NOPROBE and this has been maintained although it
is not clear that is really needed as most platforms don't use probing.
There appears to be a great deal of blind copy and paste of this code.

Signed-off-by: default avatarRob Herring <robh@kernel.org>
Cc: Michael Hennerich <michael.hennerich@analog.com>
Acked-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Cc: Alexandre Courbot <gnurou@gmail.com>
Cc: Ray Jui <rjui@broadcom.com>
Cc: Stephen Warren <swarren@wwwdotorg.org>
Cc: Thierry Reding <thierry.reding@gmail.com>
Cc: linux-gpio@vger.kernel.org
Cc: bcm-kernel-feedback-list@broadcom.com
Cc: linux-tegra@vger.kernel.org
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent d705073c

drivers/gpio/gpio-adp5588.c

+1 −9
Original line number Diff line number Diff line
@@ -305,15 +305,7 @@ static int adp5588_irq_setup(struct adp5588_gpio *dev) 
		irq_set_chip_and_handler(irq, &adp5588_irq_chip,

					 handle_level_irq);

		irq_set_nested_thread(irq, 1);

#ifdef CONFIG_ARM

		/*

		 * ARM needs us to explicitly flag the IRQ as VALID,

		 * once we do so, it will also set the noprobe.

		 */

		set_irq_flags(irq, IRQF_VALID);

#else

		irq_set_noprobe(irq);

#endif

		irq_modify_status(irq, IRQ_NOREQUEST, IRQ_NOPROBE);

	}



	ret = request_threaded_irq(client->irq,

drivers/gpio/gpio-bcm-kona.c

+0 −15
Original line number Diff line number Diff line
@@ -525,11 +525,7 @@ static int bcm_kona_gpio_irq_map(struct irq_domain *d, unsigned int irq, 
		return ret;

	irq_set_lockdep_class(irq, &gpio_lock_class);

	irq_set_chip_and_handler(irq, &bcm_gpio_irq_chip, handle_simple_irq);

#ifdef CONFIG_ARM

	set_irq_flags(irq, IRQF_VALID);

#else

	irq_set_noprobe(irq);

#endif



	return 0;

}
@@ -644,17 +640,6 @@ static int bcm_kona_gpio_probe(struct platform_device *pdev) 
		dev_err(dev, "Couldn't add GPIO chip -- %d\n", ret);

		goto err_irq_domain;

	}

	for (i = 0; i < chip->ngpio; i++) {

		int irq = bcm_kona_gpio_to_irq(chip, i);

		irq_set_lockdep_class(irq, &gpio_lock_class);

		irq_set_chip_and_handler(irq, &bcm_gpio_irq_chip,

					 handle_simple_irq);

#ifdef CONFIG_ARM

		set_irq_flags(irq, IRQF_VALID);

#else

		irq_set_noprobe(irq);

#endif

	}

	for (i = 0; i < kona_gpio->num_bank; i++) {

		bank = &kona_gpio->banks[i];

		irq_set_chained_handler_and_data(bank->irq,

drivers/gpio/gpio-davinci.c

+0 −1
Original line number Diff line number Diff line
@@ -423,7 +423,6 @@ davinci_gpio_irq_map(struct irq_domain *d, unsigned int irq, 
	irq_set_irq_type(irq, IRQ_TYPE_NONE);

	irq_set_chip_data(irq, (__force void *)g);

	irq_set_handler_data(irq, (void *)__gpio_mask(hw));

	set_irq_flags(irq, IRQF_VALID);



	return 0;

}

drivers/gpio/gpio-em.c

+0 −1
Original line number Diff line number Diff line
@@ -261,7 +261,6 @@ static int em_gio_irq_domain_map(struct irq_domain *h, unsigned int irq, 


	irq_set_chip_data(irq, h->host_data);

	irq_set_chip_and_handler(irq, &p->irq_chip, handle_level_irq);

	set_irq_flags(irq, IRQF_VALID); /* kill me now */

	return 0;

}

drivers/gpio/gpio-ep93xx.c

+1 −1
Original line number Diff line number Diff line
@@ -236,7 +236,7 @@ static void ep93xx_gpio_init_irq(void) 
	     gpio_irq <= gpio_to_irq(EP93XX_GPIO_LINE_MAX_IRQ); ++gpio_irq) {

		irq_set_chip_and_handler(gpio_irq, &ep93xx_gpio_irq_chip,

					 handle_level_irq);

		set_irq_flags(gpio_irq, IRQF_VALID);

		irq_clear_status_flags(gpio_irq, IRQ_NOREQUEST);

	}



	irq_set_chained_handler(IRQ_EP93XX_GPIO_AB,