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-stmpe.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-stmpe.c')
| -rw-r--r-- | drivers/gpio/gpio-stmpe.c | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/drivers/gpio/gpio-stmpe.c b/drivers/gpio/gpio-stmpe.c index e2e1b16a42db..21364e95065d 100644 --- a/drivers/gpio/gpio-stmpe.c +++ b/drivers/gpio/gpio-stmpe.c @@ -484,21 +484,20 @@ static int stmpe_gpio_probe(struct platform_device *pdev) if (stmpe_gpio->norequest_mask & BIT(i)) clear_bit(i, stmpe_gpio->chip.irq_valid_mask); } - ret = gpiochip_irqchip_add(&stmpe_gpio->chip, - &stmpe_gpio_irq_chip, - 0, - handle_simple_irq, - IRQ_TYPE_NONE); + ret = gpiochip_irqchip_add_nested(&stmpe_gpio->chip, + &stmpe_gpio_irq_chip, + 0, + handle_simple_irq, + IRQ_TYPE_NONE); if (ret) { dev_err(&pdev->dev, "could not connect irqchip to gpiochip\n"); goto out_disable; } - gpiochip_set_chained_irqchip(&stmpe_gpio->chip, - &stmpe_gpio_irq_chip, - irq, - NULL); + gpiochip_set_nested_irqchip(&stmpe_gpio->chip, + &stmpe_gpio_irq_chip, + irq); } platform_set_drvdata(pdev, stmpe_gpio); |