Merge tag 'ext4_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso...

[mirror_ubuntu-artful-kernel.git] / drivers / gpio / gpio-pcf857x.c

diff --git a/drivers/gpio/gpio-pcf857x.c b/drivers/gpio/gpio-pcf857x.c
index d168410e2338eac0dd04d2386efd4edc35460862..895af42a4513581ae1b9f1059384ce866777f9f7 100644 (file)
--- a/drivers/gpio/gpio-pcf857x.c
+++ b/drivers/gpio/gpio-pcf857x.c
@@ -378,9 +378,10 @@ static int pcf857x_probe(struct i2c_client *client,
 
        /* Enable irqchip if we have an interrupt */
        if (client->irq) {
-               status = gpiochip_irqchip_add(&gpio->chip, &pcf857x_irq_chip,
-                                             0, handle_level_irq,
-                                             IRQ_TYPE_NONE);
+               status = gpiochip_irqchip_add_nested(&gpio->chip,
+                                                    &pcf857x_irq_chip,
+                                                    0, handle_level_irq,
+                                                    IRQ_TYPE_NONE);
                if (status) {
                        dev_err(&client->dev, "cannot add irqchip\n");
                        goto fail;
@@ -393,8 +394,8 @@ static int pcf857x_probe(struct i2c_client *client,
                if (status)
                        goto fail;
 
-               gpiochip_set_chained_irqchip(&gpio->chip, &pcf857x_irq_chip,
-                                            client->irq, NULL);
+               gpiochip_set_nested_irqchip(&gpio->chip, &pcf857x_irq_chip,
+                                           client->irq);
                gpio->irq_parent = client->irq;
        }