diff options
| author |   Marek Vasut <marek.vasut@gmail.com> | 2018-06-11 13:58:38 +0200 |
|---|---|---|
| committer |   Lee Jones <lee.jones@linaro.org> | 2018-07-04 07:15:29 +0100 |
| commit | 7494de0454af50215bc46c93c83b88a32ca39fab (patch) | |
| tree | e6ffc3743c2a9fc1f071c23100818323a9bd65ed /drivers/mfd/da9063-irq.c | |
| parent | Linux 4.18-rc1 (diff) | |
| download | linux-dev-7494de0454af50215bc46c93c83b88a32ca39fab.tar.xz linux-dev-7494de0454af50215bc46c93c83b88a32ca39fab.zip | |
mfd: da9063: Replace regmap_add_irq_chip with devm counterpart
Use devm_regmap_add_irq_chip() instead of plain regmap_add_irq_chip(),
which removes the need for da9063_irq_exit() altogether and also
fixes a bug in da9063_device_init() where the da9063_irq_exit() was
not called in a failpath.
Signed-off-by: Marek Vasut <marek.vasut+renesas@gmail.com>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
Diffstat (limited to 'drivers/mfd/da9063-irq.c')
| -rw-r--r-- | drivers/mfd/da9063-irq.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/drivers/mfd/da9063-irq.c b/drivers/mfd/da9063-irq.c index 207bbfe55449..da6ceb41f0d1 100644 --- a/drivers/mfd/da9063-irq.c +++ b/drivers/mfd/da9063-irq.c @@ -170,7 +170,8 @@ int da9063_irq_init(struct da9063 *da9063) return -EINVAL; } - ret = regmap_add_irq_chip(da9063->regmap, da9063->chip_irq, + ret = devm_regmap_add_irq_chip(da9063->dev, da9063->regmap, + da9063->chip_irq, IRQF_TRIGGER_LOW | IRQF_ONESHOT | IRQF_SHARED, da9063->irq_base, &da9063_irq_chip, &da9063->regmap_irq); @@ -182,8 +183,3 @@ int da9063_irq_init(struct da9063 *da9063) return 0; } - -void da9063_irq_exit(struct da9063 *da9063) -{ - regmap_del_irq_chip(da9063->chip_irq, da9063->regmap_irq); -} |