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: David Cohen <david.a.cohen@linux.intel.com>
Acked-by: Mika Westerberg <mika.westerberg@linux.intel.com>
Tested-by: Mika Westerberg <mika.westerberg@linux.intel.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>

diff --git a/drivers/gpio/gpio-intel-mid.c b/drivers/gpio/gpio-intel-mid.c
index be803af658acf2e95f4782ff40ae2a560ec03f11..17f135046c7fff326ecba9b767520c614c0a6257 100644 (file)
--- a/drivers/gpio/gpio-intel-mid.c
+++ b/drivers/gpio/gpio-intel-mid.c
@@ -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;
 
-       irq_set_chip_and_handler_name(irq, &intel_mid_irqchip,
-                                     handle_simple_irq, "demux");
+       irq_set_chip_and_handler(irq, &intel_mid_irqchip, handle_simple_irq);
        irq_set_chip_data(irq, priv);
        irq_set_irq_type(irq, IRQ_TYPE_NONE);
 

diff --git a/drivers/gpio/gpio-lynxpoint.c b/drivers/gpio/gpio-lynxpoint.c
index f1ca9d5880b67492835d523d1c425c3efd785344..89867ed7bd50b7ddd79c5750ca8b52437804fef8 100644 (file)
--- a/drivers/gpio/gpio-lynxpoint.c
+++ b/drivers/gpio/gpio-lynxpoint.c
@@ -331,8 +331,7 @@ static int lp_gpio_irq_map(struct irq_domain *d, unsigned int irq,
 {
        struct lp_gpio *lg = d->host_data;
 
-       irq_set_chip_and_handler_name(irq, &lp_irqchip, handle_simple_irq,
-                                     "demux");
+       irq_set_chip_and_handler(irq, &lp_irqchip, handle_simple_irq);
        irq_set_chip_data(irq, lg);
        irq_set_irq_type(irq, IRQ_TYPE_NONE);
 

diff --git a/drivers/gpio/gpio-msic.c b/drivers/gpio/gpio-msic.c
index d75eaa3a1dcc5f2e158ff4bdf59c991402a3b822..69d60ab1d698061b05fdc11f1b0f2a921c5bd3ea 100644 (file)
--- a/drivers/gpio/gpio-msic.c
+++ b/drivers/gpio/gpio-msic.c
@@ -305,10 +305,9 @@ static int platform_msic_gpio_probe(struct platform_device *pdev)
 
        for (i = 0; i < mg->chip.ngpio; i++) {
                irq_set_chip_data(i + mg->irq_base, mg);
-               irq_set_chip_and_handler_name(i + mg->irq_base,
-                                             &msic_irqchip,
-                                             handle_simple_irq,
-                                             "demux");
+               irq_set_chip_and_handler(i + mg->irq_base,
+                                        &msic_irqchip,
+                                        handle_simple_irq);
        }
        irq_set_chained_handler(mg->irq, msic_gpio_irq_handler);
        irq_set_handler_data(mg->irq, mg);

diff --git a/drivers/gpio/gpio-timberdale.c b/drivers/gpio/gpio-timberdale.c
index 7a0e956ef1ed1b47d8d034bf8e48ed3f812010f3..521971e6a9f56c674d27468694ec7e89a981bec5 100644 (file)
--- a/drivers/gpio/gpio-timberdale.c
+++ b/drivers/gpio/gpio-timberdale.c
@@ -290,8 +290,8 @@ static int timbgpio_probe(struct platform_device *pdev)
                return 0;
 
        for (i = 0; i < pdata->nr_pins; i++) {
-               irq_set_chip_and_handler_name(tgpio->irq_base + i,
-                       &timbgpio_irqchip, handle_simple_irq, "mux");
+               irq_set_chip_and_handler(tgpio->irq_base + i,
+                       &timbgpio_irqchip, handle_simple_irq);
                irq_set_chip_data(tgpio->irq_base + i, tgpio);
 #ifdef CONFIG_ARM
                set_irq_flags(tgpio->irq_base + i, IRQF_VALID | IRQF_PROBE);