Commit 7494de04 authored by Marek Vasut's avatar Marek Vasut Committed by Lee Jones

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: default avatarMarek Vasut <marek.vasut+renesas@gmail.com>
Signed-off-by: default avatarLee Jones <lee.jones@linaro.org>
parent ce397d21
...@@ -238,7 +238,6 @@ int da9063_device_init(struct da9063 *da9063, unsigned int irq) ...@@ -238,7 +238,6 @@ int da9063_device_init(struct da9063 *da9063, unsigned int irq)
void da9063_device_exit(struct da9063 *da9063) void da9063_device_exit(struct da9063 *da9063)
{ {
mfd_remove_devices(da9063->dev); mfd_remove_devices(da9063->dev);
da9063_irq_exit(da9063);
} }
MODULE_DESCRIPTION("PMIC driver for Dialog DA9063"); MODULE_DESCRIPTION("PMIC driver for Dialog DA9063");
......
...@@ -170,7 +170,8 @@ int da9063_irq_init(struct da9063 *da9063) ...@@ -170,7 +170,8 @@ int da9063_irq_init(struct da9063 *da9063)
return -EINVAL; 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, IRQF_TRIGGER_LOW | IRQF_ONESHOT | IRQF_SHARED,
da9063->irq_base, &da9063_irq_chip, da9063->irq_base, &da9063_irq_chip,
&da9063->regmap_irq); &da9063->regmap_irq);
...@@ -182,8 +183,3 @@ int da9063_irq_init(struct da9063 *da9063) ...@@ -182,8 +183,3 @@ int da9063_irq_init(struct da9063 *da9063)
return 0; return 0;
} }
void da9063_irq_exit(struct da9063 *da9063)
{
regmap_del_irq_chip(da9063->chip_irq, da9063->regmap_irq);
}
...@@ -95,6 +95,5 @@ int da9063_device_init(struct da9063 *da9063, unsigned int irq); ...@@ -95,6 +95,5 @@ int da9063_device_init(struct da9063 *da9063, unsigned int irq);
int da9063_irq_init(struct da9063 *da9063); int da9063_irq_init(struct da9063 *da9063);
void da9063_device_exit(struct da9063 *da9063); void da9063_device_exit(struct da9063 *da9063);
void da9063_irq_exit(struct da9063 *da9063);
#endif /* __MFD_DA9063_CORE_H__ */ #endif /* __MFD_DA9063_CORE_H__ */
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment