diff options
author | Andy Shevchenko <andriy.shevchenko@linux.intel.com> | 2020-07-28 15:55:02 +0300 |
---|---|---|
committer | Linus Walleij <linus.walleij@linaro.org> | 2020-08-04 01:25:02 +0200 |
commit | 2a93a0da06f8fcee96a7c49c756fd7c5891b0b0d (patch) | |
tree | dd95863e2c88bb022b8cf73a2485039098ffb761 /drivers/gpio | |
parent | 5f402bb17533113c21d61c2d4bc4ef4a6fa1c9a5 (diff) | |
download | linux-stable-2a93a0da06f8fcee96a7c49c756fd7c5891b0b0d.tar.gz linux-stable-2a93a0da06f8fcee96a7c49c756fd7c5891b0b0d.tar.bz2 linux-stable-2a93a0da06f8fcee96a7c49c756fd7c5891b0b0d.zip |
gpio: pca953x: Request IRQ after all initialisation done
There is logically better to request IRQ when we initialise all structures.
Align the driver with the rest on the same matter.
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Link: https://lore.kernel.org/r/20200728125504.27786-1-andriy.shevchenko@linux.intel.com
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'drivers/gpio')
-rw-r--r-- | drivers/gpio/gpio-pca953x.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/drivers/gpio/gpio-pca953x.c b/drivers/gpio/gpio-pca953x.c index ab22152bf3e8..bd2e96c34f82 100644 --- a/drivers/gpio/gpio-pca953x.c +++ b/drivers/gpio/gpio-pca953x.c @@ -865,17 +865,7 @@ static int pca953x_irq_setup(struct pca953x_chip *chip, int irq_base) bitmap_and(chip->irq_stat, irq_stat, reg_direction, chip->gpio_chip.ngpio); mutex_init(&chip->irq_lock); - ret = devm_request_threaded_irq(&client->dev, client->irq, - NULL, pca953x_irq_handler, - IRQF_ONESHOT | IRQF_SHARED, - dev_name(&client->dev), chip); - if (ret) { - dev_err(&client->dev, "failed to request irq %d\n", - client->irq); - return ret; - } - - irq_chip->name = dev_name(&chip->client->dev); + irq_chip->name = dev_name(&client->dev); irq_chip->irq_mask = pca953x_irq_mask; irq_chip->irq_unmask = pca953x_irq_unmask; irq_chip->irq_set_wake = pca953x_irq_set_wake; @@ -895,6 +885,16 @@ static int pca953x_irq_setup(struct pca953x_chip *chip, int irq_base) girq->threaded = true; girq->first = irq_base; /* FIXME: get rid of this */ + ret = devm_request_threaded_irq(&client->dev, client->irq, + NULL, pca953x_irq_handler, + IRQF_ONESHOT | IRQF_SHARED, + dev_name(&client->dev), chip); + if (ret) { + dev_err(&client->dev, "failed to request irq %d\n", + client->irq); + return ret; + } + return 0; } |