diff options
| author | Linus Walleij <linus.walleij@linaro.org> | 2016-12-07 17:24:12 +0300 |
|---|---|---|
| committer | Linus Walleij <linus.walleij@linaro.org> | 2016-12-07 17:24:12 +0300 |
| commit | acf1fcf77247efa01d7213f53082451f6c9c8f3b (patch) | |
| tree | 7f4acc733d5384e0f342240a82c6156f5619e80c /drivers/gpio/gpio-pca953x.c | |
| parent | eb485c7d9e6d71e4f621edb83573cb85c1d22975 (diff) | |
| parent | 35ca3f61617db77364e40c1977952c5ee0a776cb (diff) | |
| download | linux-acf1fcf77247efa01d7213f53082451f6c9c8f3b.tar.xz | |
Merge branch 'thread-irq-simpler' into devel
Diffstat (limited to 'drivers/gpio/gpio-pca953x.c')
| -rw-r--r-- | drivers/gpio/gpio-pca953x.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/drivers/gpio/gpio-pca953x.c b/drivers/gpio/gpio-pca953x.c index 601c4550ee27..9733678f0219 100644 --- a/drivers/gpio/gpio-pca953x.c +++ b/drivers/gpio/gpio-pca953x.c @@ -636,20 +636,20 @@ static int pca953x_irq_setup(struct pca953x_chip *chip, return ret; } - ret = gpiochip_irqchip_add(&chip->gpio_chip, - &pca953x_irq_chip, - irq_base, - handle_simple_irq, - IRQ_TYPE_NONE); + ret = gpiochip_irqchip_add_nested(&chip->gpio_chip, + &pca953x_irq_chip, + irq_base, + handle_simple_irq, + IRQ_TYPE_NONE); if (ret) { dev_err(&client->dev, "could not connect irqchip to gpiochip\n"); return ret; } - gpiochip_set_chained_irqchip(&chip->gpio_chip, - &pca953x_irq_chip, - client->irq, NULL); + gpiochip_set_nested_irqchip(&chip->gpio_chip, + &pca953x_irq_chip, + client->irq); } return 0; |