Merge tag 'gpio-v4.2-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux...

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

diff --git a/drivers/gpio/gpio-mxc.c b/drivers/gpio/gpio-mxc.c
index 7007036a4db85e7eda7b46eb3813846ddaa94351..ec1eb1b7250ff145f5459f50b4c874154f1e23dc 100644 (file)
--- a/drivers/gpio/gpio-mxc.c
+++ b/drivers/gpio/gpio-mxc.c
@@ -437,14 +437,13 @@ static int mxc_gpio_probe(struct platform_device *pdev)
                irq_set_chained_handler(port->irq, mx2_gpio_irq_handler);
        } else {
                /* setup one handler for each entry */
-               irq_set_chained_handler(port->irq, mx3_gpio_irq_handler);
-               irq_set_handler_data(port->irq, port);
-               if (port->irq_high > 0) {
+               irq_set_chained_handler_and_data(port->irq,
+                                                mx3_gpio_irq_handler, port);
+               if (port->irq_high > 0)
                        /* setup handler for GPIO 16 to 31 */
-                       irq_set_chained_handler(port->irq_high,
-                                               mx3_gpio_irq_handler);
-                       irq_set_handler_data(port->irq_high, port);
-               }
+                       irq_set_chained_handler_and_data(port->irq_high,
+                                                        mx3_gpio_irq_handler,
+                                                        port);
        }
 
        err = bgpio_init(&port->bgc, &pdev->dev, 4,