| Message ID | 20180606100003.17067-1-marek.vasut+renesas@gmail.com (mailing list archive) |
|---|---|
| State | Superseded |
| Delegated to: | Geert Uytterhoeven |
| Headers | show |
On 06/06/2018 11:59 AM, Marek Vasut wrote: > 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> > Cc: Geert Uytterhoeven <geert+renesas@glider.be> > Cc: Lee Jones <lee.jones@linaro.org> > Cc: Mark Brown <broonie@kernel.org> > Cc: Steve Twiss <stwiss.opensource@diasemi.com> > Cc: Wolfram Sang <wsa+renesas@sang-engineering.com> > Cc: linux-renesas-soc@vger.kernel.org So it's just this one patch that's missing AB/RB and the series should be good? > --- > V5: New patch > --- > drivers/mfd/da9063-core.c | 1 - > drivers/mfd/da9063-irq.c | 8 ++------ > include/linux/mfd/da9063/core.h | 1 - > 3 files changed, 2 insertions(+), 8 deletions(-) > > diff --git a/drivers/mfd/da9063-core.c b/drivers/mfd/da9063-core.c > index 6c2870d4e754..2647bb371d86 100644 > --- a/drivers/mfd/da9063-core.c > +++ b/drivers/mfd/da9063-core.c > @@ -238,7 +238,6 @@ int da9063_device_init(struct da9063 *da9063, unsigned int irq) > void da9063_device_exit(struct da9063 *da9063) > { > mfd_remove_devices(da9063->dev); > - da9063_irq_exit(da9063); > } > > MODULE_DESCRIPTION("PMIC driver for Dialog DA9063"); > 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); > -} > diff --git a/include/linux/mfd/da9063/core.h b/include/linux/mfd/da9063/core.h > index f3ae65db4c86..9ab7049977aa 100644 > --- a/include/linux/mfd/da9063/core.h > +++ b/include/linux/mfd/da9063/core.h > @@ -95,6 +95,5 @@ int da9063_device_init(struct da9063 *da9063, unsigned int irq); > int da9063_irq_init(struct da9063 *da9063); > > void da9063_device_exit(struct da9063 *da9063); > -void da9063_irq_exit(struct da9063 *da9063); > > #endif /* __MFD_DA9063_CORE_H__ */ >
On Thu, 07 Jun 2018, Marek Vasut wrote: > On 06/06/2018 11:59 AM, Marek Vasut wrote: > > 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> > > Cc: Geert Uytterhoeven <geert+renesas@glider.be> > > Cc: Lee Jones <lee.jones@linaro.org> > > Cc: Mark Brown <broonie@kernel.org> > > Cc: Steve Twiss <stwiss.opensource@diasemi.com> > > Cc: Wolfram Sang <wsa+renesas@sang-engineering.com> > > Cc: linux-renesas-soc@vger.kernel.org > > So it's just this one patch that's missing AB/RB and the series should > be good? Looks fine. Although we'll let it sit for a while in case anyone else has any thoughts. The merge window is currently open, so there is no rush to apply. > > --- > > V5: New patch > > --- > > drivers/mfd/da9063-core.c | 1 - > > drivers/mfd/da9063-irq.c | 8 ++------ > > include/linux/mfd/da9063/core.h | 1 - > > 3 files changed, 2 insertions(+), 8 deletions(-) For my own reference: Acked-for-MFD-by: Lee Jones <lee.jones@linaro.org>
On 06/07/2018 02:41 PM, Lee Jones wrote: > On Thu, 07 Jun 2018, Marek Vasut wrote: > >> On 06/06/2018 11:59 AM, Marek Vasut wrote: >>> 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> >>> Cc: Geert Uytterhoeven <geert+renesas@glider.be> >>> Cc: Lee Jones <lee.jones@linaro.org> >>> Cc: Mark Brown <broonie@kernel.org> >>> Cc: Steve Twiss <stwiss.opensource@diasemi.com> >>> Cc: Wolfram Sang <wsa+renesas@sang-engineering.com> >>> Cc: linux-renesas-soc@vger.kernel.org >> >> So it's just this one patch that's missing AB/RB and the series should >> be good? > > Looks fine. Although we'll let it sit for a while in case anyone else > has any thoughts. Fine by me. > The merge window is currently open, so there is no rush to apply. This is still 4.18 material ? Hum, OK. >>> --- >>> V5: New patch >>> --- >>> drivers/mfd/da9063-core.c | 1 - >>> drivers/mfd/da9063-irq.c | 8 ++------ >>> include/linux/mfd/da9063/core.h | 1 - >>> 3 files changed, 2 insertions(+), 8 deletions(-) > > For my own reference: > Acked-for-MFD-by: Lee Jones <lee.jones@linaro.org> Added to my tree.
On Thu, 07 Jun 2018, Marek Vasut wrote: > On 06/07/2018 02:41 PM, Lee Jones wrote: > > On Thu, 07 Jun 2018, Marek Vasut wrote: > > > >> On 06/06/2018 11:59 AM, Marek Vasut wrote: > >>> 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> > >>> Cc: Geert Uytterhoeven <geert+renesas@glider.be> > >>> Cc: Lee Jones <lee.jones@linaro.org> > >>> Cc: Mark Brown <broonie@kernel.org> > >>> Cc: Steve Twiss <stwiss.opensource@diasemi.com> > >>> Cc: Wolfram Sang <wsa+renesas@sang-engineering.com> > >>> Cc: linux-renesas-soc@vger.kernel.org > >> > >> So it's just this one patch that's missing AB/RB and the series should > >> be good? > > > > Looks fine. Although we'll let it sit for a while in case anyone else > > has any thoughts. > > Fine by me. > > > The merge window is currently open, so there is no rush to apply. > > This is still 4.18 material ? Hum, OK. You mean this could be added to v4.18? If so, not a chance. I normally cut off accepting trivial patches at around -rc6(ish). Large sets like this require a longer soak in -next for all of the build bots and testers to have their wicked way with them and for potential merge conflicts to show.
On 06/08/2018 08:37 AM, Lee Jones wrote: > On Thu, 07 Jun 2018, Marek Vasut wrote: > >> On 06/07/2018 02:41 PM, Lee Jones wrote: >>> On Thu, 07 Jun 2018, Marek Vasut wrote: >>> >>>> On 06/06/2018 11:59 AM, Marek Vasut wrote: >>>>> 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> >>>>> Cc: Geert Uytterhoeven <geert+renesas@glider.be> >>>>> Cc: Lee Jones <lee.jones@linaro.org> >>>>> Cc: Mark Brown <broonie@kernel.org> >>>>> Cc: Steve Twiss <stwiss.opensource@diasemi.com> >>>>> Cc: Wolfram Sang <wsa+renesas@sang-engineering.com> >>>>> Cc: linux-renesas-soc@vger.kernel.org >>>> >>>> So it's just this one patch that's missing AB/RB and the series should >>>> be good? >>> >>> Looks fine. Although we'll let it sit for a while in case anyone else >>> has any thoughts. >> >> Fine by me. >> >>> The merge window is currently open, so there is no rush to apply. >> >> This is still 4.18 material ? Hum, OK. > > You mean this could be added to v4.18? If so, not a chance. I > normally cut off accepting trivial patches at around -rc6(ish). Large > sets like this require a longer soak in -next for all of the build > bots and testers to have their wicked way with them and for potential > merge conflicts to show. Fine
diff --git a/drivers/mfd/da9063-core.c b/drivers/mfd/da9063-core.c index 6c2870d4e754..2647bb371d86 100644 --- a/drivers/mfd/da9063-core.c +++ b/drivers/mfd/da9063-core.c @@ -238,7 +238,6 @@ int da9063_device_init(struct da9063 *da9063, unsigned int irq) void da9063_device_exit(struct da9063 *da9063) { mfd_remove_devices(da9063->dev); - da9063_irq_exit(da9063); } MODULE_DESCRIPTION("PMIC driver for Dialog DA9063"); 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); -} diff --git a/include/linux/mfd/da9063/core.h b/include/linux/mfd/da9063/core.h index f3ae65db4c86..9ab7049977aa 100644 --- a/include/linux/mfd/da9063/core.h +++ b/include/linux/mfd/da9063/core.h @@ -95,6 +95,5 @@ int da9063_device_init(struct da9063 *da9063, unsigned int irq); int da9063_irq_init(struct da9063 *da9063); void da9063_device_exit(struct da9063 *da9063); -void da9063_irq_exit(struct da9063 *da9063); #endif /* __MFD_DA9063_CORE_H__ */
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> Cc: Geert Uytterhoeven <geert+renesas@glider.be> Cc: Lee Jones <lee.jones@linaro.org> Cc: Mark Brown <broonie@kernel.org> Cc: Steve Twiss <stwiss.opensource@diasemi.com> Cc: Wolfram Sang <wsa+renesas@sang-engineering.com> Cc: linux-renesas-soc@vger.kernel.org --- V5: New patch --- drivers/mfd/da9063-core.c | 1 - drivers/mfd/da9063-irq.c | 8 ++------ include/linux/mfd/da9063/core.h | 1 - 3 files changed, 2 insertions(+), 8 deletions(-)