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

Commit e5428a68 authored by Linus Walleij's avatar Linus Walleij
Browse files

gpio: drop users of irq_set_chip_and_handler_name() 



Switch all users of irq_set_chip_and_handler_name() to simply
use irq_set_chip_and_handler(), all just provide a boilerplate
name like "demux" or "mux" - a fact which is anyway obvious
from the hwirq number from the irqdomain now present in e.g.
/proc/interrupts.

Cc: Mathias Nyman <mathias.nyman@linux.intel.com>
Cc: Dan Carpenter <dan.carpenter@oracle.com>
Acked-by: default avatarDavid Cohen <david.a.cohen@linux.intel.com>
Acked-by: default avatarMika Westerberg <mika.westerberg@linux.intel.com>
Tested-by: default avatarMika Westerberg <mika.westerberg@linux.intel.com>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent 03621b60

drivers/gpio/gpio-intel-mid.c

+1 −2
Original line number Original line Diff line number Diff line
@@ -358,8 +358,7 @@ static int intel_gpio_irq_map(struct irq_domain *d, unsigned int irq, 
{

{

	struct intel_mid_gpio *priv = d->host_data;

	struct intel_mid_gpio *priv = d->host_data;





	irq_set_chip_and_handler_name(irq, &intel_mid_irqchip,

	irq_set_chip_and_handler(irq, &intel_mid_irqchip, handle_simple_irq);

				      handle_simple_irq, "demux");

	irq_set_chip_data(irq, priv);

	irq_set_chip_data(irq, priv);

	irq_set_irq_type(irq, IRQ_TYPE_NONE);

	irq_set_irq_type(irq, IRQ_TYPE_NONE);

drivers/gpio/gpio-lynxpoint.c

+1 −2
Original line number Original line Diff line number Diff line
@@ -331,8 +331,7 @@ static int lp_gpio_irq_map(struct irq_domain *d, unsigned int irq, 
{

{

	struct lp_gpio *lg = d->host_data;

	struct lp_gpio *lg = d->host_data;





	irq_set_chip_and_handler_name(irq, &lp_irqchip, handle_simple_irq,

	irq_set_chip_and_handler(irq, &lp_irqchip, handle_simple_irq);

				      "demux");

	irq_set_chip_data(irq, lg);

	irq_set_chip_data(irq, lg);

	irq_set_irq_type(irq, IRQ_TYPE_NONE);

	irq_set_irq_type(irq, IRQ_TYPE_NONE);

drivers/gpio/gpio-msic.c

+3 −4
Original line number Original line Diff line number Diff line
@@ -305,10 +305,9 @@ static int platform_msic_gpio_probe(struct platform_device *pdev) 




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

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

		irq_set_chip_data(i + mg->irq_base, mg);

		irq_set_chip_data(i + mg->irq_base, mg);

		irq_set_chip_and_handler_name(i + mg->irq_base,

		irq_set_chip_and_handler(i + mg->irq_base,

					 &msic_irqchip,

					 &msic_irqchip,

					      handle_simple_irq,

					 handle_simple_irq);

					      "demux");

	}

	}

	irq_set_chained_handler(mg->irq, msic_gpio_irq_handler);

	irq_set_chained_handler(mg->irq, msic_gpio_irq_handler);

	irq_set_handler_data(mg->irq, mg);

	irq_set_handler_data(mg->irq, mg);

drivers/gpio/gpio-timberdale.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -290,8 +290,8 @@ static int timbgpio_probe(struct platform_device *pdev) 
		return 0;

		return 0;





	for (i = 0; i < pdata->nr_pins; i++) {

	for (i = 0; i < pdata->nr_pins; i++) {

		irq_set_chip_and_handler_name(tgpio->irq_base + i,

		irq_set_chip_and_handler(tgpio->irq_base + i,

			&timbgpio_irqchip, handle_simple_irq, "mux");

			&timbgpio_irqchip, handle_simple_irq);

		irq_set_chip_data(tgpio->irq_base + i, tgpio);

		irq_set_chip_data(tgpio->irq_base + i, tgpio);

#ifdef CONFIG_ARM

#ifdef CONFIG_ARM

		set_irq_flags(tgpio->irq_base + i, IRQF_VALID | IRQF_PROBE);

		set_irq_flags(tgpio->irq_base + i, IRQF_VALID | IRQF_PROBE);