Merge tag 'tty-5.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty

[linux-2.6-microblaze.git] / drivers / mfd / da9055-core.c

diff --git a/drivers/mfd/da9055-core.c b/drivers/mfd/da9055-core.c
index d074d21..c3bcbd8 100644 (file)
--- 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[] = {
        {