4 files changed, 7 insertions, 10 deletions

diff --git a/drivers/gpio/gpio-intel-mid.c b/drivers/gpio/gpio-intel-mid.c
index be803af658ac..17f135046c7f 100644
--- 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 f1ca9d5880b6..89867ed7bd50 100644
--- 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 d75eaa3a1dcc..69d60ab1d698 100644
--- 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 7a0e956ef1ed..521971e6a9f5 100644
--- 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);