| Message ID | ab8e02c022c8b90d4b65bf13e2f2c402e54f2cf5.1438692348.git.Adam.Thomson.Opensource@diasemi.com (mailing list archive) |
|---|---|
| State | Not Applicable, archived |
| Headers | show |
On Tue, 04 Aug 2015, Adam Thomson wrote: > Signed-off-by: Adam Thomson <Adam.Thomson.Opensource@diasemi.com> > --- > > Changes in v4: > - N/A > > Changes in v3: > - Initial version. > > Changes in v2: > - N/A > > drivers/mfd/da9150-core.c | 35 +++++------------------------------ > 1 file changed, 5 insertions(+), 30 deletions(-) Perhaps a Suggested-by for this and the relative paths patch wouldn't go amiss, but it's not a show stopper. Acked-by: Lee Jones <lee.jones@linaro.org> > diff --git a/drivers/mfd/da9150-core.c b/drivers/mfd/da9150-core.c > index 85ca4b5..195fdcf 100644 > --- a/drivers/mfd/da9150-core.c > +++ b/drivers/mfd/da9150-core.c > @@ -355,39 +355,14 @@ static const struct regmap_irq_chip da9150_regmap_irq_chip = { > }; > > static struct resource da9150_gpadc_resources[] = { > - { > - .name = "GPADC", > - .start = DA9150_IRQ_GPADC, > - .end = DA9150_IRQ_GPADC, > - .flags = IORESOURCE_IRQ, > - }, > + DEFINE_RES_IRQ_NAMED(DA9150_IRQ_GPADC, "GPADC"), > }; > > static struct resource da9150_charger_resources[] = { > - { > - .name = "CHG_STATUS", > - .start = DA9150_IRQ_CHG, > - .end = DA9150_IRQ_CHG, > - .flags = IORESOURCE_IRQ, > - }, > - { > - .name = "CHG_TJUNC", > - .start = DA9150_IRQ_TJUNC, > - .end = DA9150_IRQ_TJUNC, > - .flags = IORESOURCE_IRQ, > - }, > - { > - .name = "CHG_VFAULT", > - .start = DA9150_IRQ_VFAULT, > - .end = DA9150_IRQ_VFAULT, > - .flags = IORESOURCE_IRQ, > - }, > - { > - .name = "CHG_VBUS", > - .start = DA9150_IRQ_VBUS, > - .end = DA9150_IRQ_VBUS, > - .flags = IORESOURCE_IRQ, > - }, > + DEFINE_RES_IRQ_NAMED(DA9150_IRQ_CHG, "CHG_STATUS"), > + DEFINE_RES_IRQ_NAMED(DA9150_IRQ_TJUNC, "CHG_TJUNC"), > + DEFINE_RES_IRQ_NAMED(DA9150_IRQ_VFAULT, "CHG_VFAULT"), > + DEFINE_RES_IRQ_NAMED(DA9150_IRQ_VBUS, "CHG_VBUS"), > }; > > static struct resource da9150_fg_resources[] = {
diff --git a/drivers/mfd/da9150-core.c b/drivers/mfd/da9150-core.c index 85ca4b5..195fdcf 100644 --- a/drivers/mfd/da9150-core.c +++ b/drivers/mfd/da9150-core.c @@ -355,39 +355,14 @@ static const struct regmap_irq_chip da9150_regmap_irq_chip = { }; static struct resource da9150_gpadc_resources[] = { - { - .name = "GPADC", - .start = DA9150_IRQ_GPADC, - .end = DA9150_IRQ_GPADC, - .flags = IORESOURCE_IRQ, - }, + DEFINE_RES_IRQ_NAMED(DA9150_IRQ_GPADC, "GPADC"), }; static struct resource da9150_charger_resources[] = { - { - .name = "CHG_STATUS", - .start = DA9150_IRQ_CHG, - .end = DA9150_IRQ_CHG, - .flags = IORESOURCE_IRQ, - }, - { - .name = "CHG_TJUNC", - .start = DA9150_IRQ_TJUNC, - .end = DA9150_IRQ_TJUNC, - .flags = IORESOURCE_IRQ, - }, - { - .name = "CHG_VFAULT", - .start = DA9150_IRQ_VFAULT, - .end = DA9150_IRQ_VFAULT, - .flags = IORESOURCE_IRQ, - }, - { - .name = "CHG_VBUS", - .start = DA9150_IRQ_VBUS, - .end = DA9150_IRQ_VBUS, - .flags = IORESOURCE_IRQ, - }, + DEFINE_RES_IRQ_NAMED(DA9150_IRQ_CHG, "CHG_STATUS"), + DEFINE_RES_IRQ_NAMED(DA9150_IRQ_TJUNC, "CHG_TJUNC"), + DEFINE_RES_IRQ_NAMED(DA9150_IRQ_VFAULT, "CHG_VFAULT"), + DEFINE_RES_IRQ_NAMED(DA9150_IRQ_VBUS, "CHG_VBUS"), }; static struct resource da9150_fg_resources[] = {
Signed-off-by: Adam Thomson <Adam.Thomson.Opensource@diasemi.com> --- Changes in v4: - N/A Changes in v3: - Initial version. Changes in v2: - N/A drivers/mfd/da9150-core.c | 35 +++++------------------------------ 1 file changed, 5 insertions(+), 30 deletions(-) -- 1.9.3 -- To unsubscribe from this list: send the line "unsubscribe linux-pm" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html