2021-06-01 07:29:34

by Zhen Lei

Subject: [PATCH 1/1] mfd: da9055: Use DEFINE_RES_IRQ_NAMED() to simplify code

No functional change.

Signed-off-by: Zhen Lei <[email protected]>
---
drivers/mfd/da9055-core.c | 38 ++++++++------------------------------
1 file changed, 8 insertions(+), 30 deletions(-)

diff --git a/drivers/mfd/da9055-core.c b/drivers/mfd/da9055-core.c
index d074d213e66170b..c3bcbd8905c6cfa 100644
--- a/drivers/mfd/da9055-core.c
+++ b/drivers/mfd/da9055-core.c
@@ -254,41 +254,19 @@ const struct regmap_config da9055_regmap_config = {
};
EXPORT_SYMBOL_GPL(da9055_regmap_config);

-static const struct resource da9055_onkey_resource = {
- .name = "ONKEY",
- .start = DA9055_IRQ_NONKEY,
- .end = DA9055_IRQ_NONKEY,
- .flags = IORESOURCE_IRQ,
-};
+static const struct resource da9055_onkey_resource =
+ DEFINE_RES_IRQ_NAMED(DA9055_IRQ_NONKEY, "ONKEY");

static const struct resource da9055_rtc_resource[] = {
- {
- .name = "ALM",
- .start = DA9055_IRQ_ALARM,
- .end = DA9055_IRQ_ALARM,
- .flags = IORESOURCE_IRQ,
- },
- {
- .name = "TICK",
- .start = DA9055_IRQ_TICK,
- .end = DA9055_IRQ_TICK,
- .flags = IORESOURCE_IRQ,
- },
+ DEFINE_RES_IRQ_NAMED(DA9055_IRQ_ALARM, "ALM"),
+ DEFINE_RES_IRQ_NAMED(DA9055_IRQ_TICK, "TICK"),
};

-static const struct resource da9055_hwmon_resource = {
- .name = "HWMON",
- .start = DA9055_IRQ_HWMON,
- .end = DA9055_IRQ_HWMON,
- .flags = IORESOURCE_IRQ,
-};
+static const struct resource da9055_hwmon_resource =
+ DEFINE_RES_IRQ_NAMED(DA9055_IRQ_HWMON, "HWMON");

-static const struct resource da9055_ld05_6_resource = {
- .name = "REGULATOR",
- .start = DA9055_IRQ_REGULATOR,
- .end = DA9055_IRQ_REGULATOR,
- .flags = IORESOURCE_IRQ,
-};
+static const struct resource da9055_ld05_6_resource =
+ DEFINE_RES_IRQ_NAMED(DA9055_IRQ_REGULATOR, "REGULATOR");

static const struct mfd_cell da9055_devs[] = {
{
--
2.26.0.106.g9fadedd

2021-06-08 13:31:41

by Adam Thomson

Subject: RE: [PATCH 1/1] mfd: da9055: Use DEFINE_RES_IRQ_NAMED() to simplify code

On 01 June 2021 08:29, Zhen Lei wrote:

> No functional change.
>
> Signed-off-by: Zhen Lei <[email protected]>

Reviewed-by: Adam Thomson <[email protected]>

> ---
> drivers/mfd/da9055-core.c | 38 ++++++++------------------------------
> 1 file changed, 8 insertions(+), 30 deletions(-)
>
> diff --git a/drivers/mfd/da9055-core.c b/drivers/mfd/da9055-core.c
> index d074d213e66170b..c3bcbd8905c6cfa 100644
> --- a/drivers/mfd/da9055-core.c
> +++ b/drivers/mfd/da9055-core.c
> @@ -254,41 +254,19 @@ const struct regmap_config da9055_regmap_config = {
> };
> EXPORT_SYMBOL_GPL(da9055_regmap_config);
>
> -static const struct resource da9055_onkey_resource = {
> - .name = "ONKEY",
> - .start = DA9055_IRQ_NONKEY,
> - .end = DA9055_IRQ_NONKEY,
> - .flags = IORESOURCE_IRQ,
> -};
> +static const struct resource da9055_onkey_resource =
> + DEFINE_RES_IRQ_NAMED(DA9055_IRQ_NONKEY, "ONKEY");
>
> static const struct resource da9055_rtc_resource[] = {
> - {
> - .name = "ALM",
> - .start = DA9055_IRQ_ALARM,
> - .end = DA9055_IRQ_ALARM,
> - .flags = IORESOURCE_IRQ,
> - },
> - {
> - .name = "TICK",
> - .start = DA9055_IRQ_TICK,
> - .end = DA9055_IRQ_TICK,
> - .flags = IORESOURCE_IRQ,
> - },
> + DEFINE_RES_IRQ_NAMED(DA9055_IRQ_ALARM, "ALM"),
> + DEFINE_RES_IRQ_NAMED(DA9055_IRQ_TICK, "TICK"),
> };
>
> -static const struct resource da9055_hwmon_resource = {
> - .name = "HWMON",
> - .start = DA9055_IRQ_HWMON,
> - .end = DA9055_IRQ_HWMON,
> - .flags = IORESOURCE_IRQ,
> -};
> +static const struct resource da9055_hwmon_resource =
> + DEFINE_RES_IRQ_NAMED(DA9055_IRQ_HWMON, "HWMON");
>
> -static const struct resource da9055_ld05_6_resource = {
> - .name = "REGULATOR",
> - .start = DA9055_IRQ_REGULATOR,
> - .end = DA9055_IRQ_REGULATOR,
> - .flags = IORESOURCE_IRQ,
> -};
> +static const struct resource da9055_ld05_6_resource =
> + DEFINE_RES_IRQ_NAMED(DA9055_IRQ_REGULATOR, "REGULATOR");
>
> static const struct mfd_cell da9055_devs[] = {
> {
> --
> 2.26.0.106.g9fadedd
>