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

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

diff --git a/drivers/gpio/gpio-timberdale.c b/drivers/gpio/gpio-timberdale.c
index 7a0e956ef1ed1b47d8d034bf8e48ed3f812010f3..f9a8fbde108e3b424785a12bb5bc52dd06ac1551 100644 (file)
--- a/drivers/gpio/gpio-timberdale.c
+++ b/drivers/gpio/gpio-timberdale.c
@@ -275,7 +275,7 @@ static int timbgpio_probe(struct platform_device *pdev)
        gc->dbg_show = NULL;
        gc->base = pdata->gpio_base;
        gc->ngpio = pdata->nr_pins;
-       gc->can_sleep = 0;
+       gc->can_sleep = false;
 
        err = gpiochip_add(gc);
        if (err)
@@ -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);