Merge tag 'dt-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

[karo-tx-linux.git] / drivers / gpio / gpio-msic.c

diff --git a/drivers/gpio/gpio-msic.c b/drivers/gpio/gpio-msic.c
index d75eaa3a1dcc5f2e158ff4bdf59c991402a3b822..8f70ded82a2bb29dabf1695e2f4b8207114e1f0f 100644 (file)
--- a/drivers/gpio/gpio-msic.c
+++ b/drivers/gpio/gpio-msic.c
@@ -292,7 +292,7 @@ static int platform_msic_gpio_probe(struct platform_device *pdev)
        mg->chip.to_irq = msic_gpio_to_irq;
        mg->chip.base = pdata->gpio_base;
        mg->chip.ngpio = MSIC_NUM_GPIO;
-       mg->chip.can_sleep = 1;
+       mg->chip.can_sleep = true;
        mg->chip.dev = dev;
 
        mutex_init(&mg->buslock);
@@ -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);