mfd: da9062: Use MFD_CELL_OF macro

Use MFD_CELL_OF macro helper instead of plain struct properties, which makes
the code a bit shorter and to have commonly defined MFD cell attributes.

Signed-off-by: Christoph Niedermaier <cniedermaier@dh-electronics.com>
Acked-by: Adam Ward <DLG-Adam.Ward.opensource@dm.renesas.com>
Signed-off-by: Lee Jones <lee@kernel.org>
Link: https://lore.kernel.org/r/20230309092254.56279-1-cniedermaier@dh-electronics.com

diff --git a/drivers/mfd/da9062-core.c b/drivers/mfd/da9062-core.c
index 40cde51..9418c58 100644 (file)
--- a/drivers/mfd/da9062-core.c
+++ b/drivers/mfd/da9062-core.c
@@ -182,34 +182,16 @@ static const struct resource da9061_onkey_resources[] = {
 };
 
 static const struct mfd_cell da9061_devs[] = {
-       {
-               .name           = "da9061-core",
-               .num_resources  = ARRAY_SIZE(da9061_core_resources),
-               .resources      = da9061_core_resources,
-       },
-       {
-               .name           = "da9062-regulators",
-               .num_resources  = ARRAY_SIZE(da9061_regulators_resources),
-               .resources      = da9061_regulators_resources,
-       },
-       {
-               .name           = "da9061-watchdog",
-               .num_resources  = ARRAY_SIZE(da9061_wdt_resources),
-               .resources      = da9061_wdt_resources,
-               .of_compatible  = "dlg,da9061-watchdog",
-       },
-       {
-               .name           = "da9061-thermal",
-               .num_resources  = ARRAY_SIZE(da9061_thermal_resources),
-               .resources      = da9061_thermal_resources,
-               .of_compatible  = "dlg,da9061-thermal",
-       },
-       {
-               .name           = "da9061-onkey",
-               .num_resources  = ARRAY_SIZE(da9061_onkey_resources),
-               .resources      = da9061_onkey_resources,
-               .of_compatible = "dlg,da9061-onkey",
-       },
+       MFD_CELL_OF("da9061-core", da9061_core_resources, NULL, 0, 0,
+                   NULL),
+       MFD_CELL_OF("da9062-regulators", da9061_regulators_resources, NULL, 0, 0,
+                   NULL),
+       MFD_CELL_OF("da9061-watchdog", da9061_wdt_resources, NULL, 0, 0,
+                   "dlg,da9061-watchdog"),
+       MFD_CELL_OF("da9061-thermal", da9061_thermal_resources, NULL, 0, 0,
+                   "dlg,da9061-thermal"),
+       MFD_CELL_OF("da9061-onkey", da9061_onkey_resources, NULL, 0, 0,
+                   "dlg,da9061-onkey"),
 };
 
 static const struct resource da9062_core_resources[] = {
@@ -246,46 +228,20 @@ static const struct resource da9062_gpio_resources[] = {
 };
 
 static const struct mfd_cell da9062_devs[] = {
-       {
-               .name           = "da9062-core",
-               .num_resources  = ARRAY_SIZE(da9062_core_resources),
-               .resources      = da9062_core_resources,
-       },
-       {
-               .name           = "da9062-regulators",
-               .num_resources  = ARRAY_SIZE(da9062_regulators_resources),
-               .resources      = da9062_regulators_resources,
-       },
-       {
-               .name           = "da9062-watchdog",
-               .num_resources  = ARRAY_SIZE(da9062_wdt_resources),
-               .resources      = da9062_wdt_resources,
-               .of_compatible  = "dlg,da9062-watchdog",
-       },
-       {
-               .name           = "da9062-thermal",
-               .num_resources  = ARRAY_SIZE(da9062_thermal_resources),
-               .resources      = da9062_thermal_resources,
-               .of_compatible  = "dlg,da9062-thermal",
-       },
-       {
-               .name           = "da9062-rtc",
-               .num_resources  = ARRAY_SIZE(da9062_rtc_resources),
-               .resources      = da9062_rtc_resources,
-               .of_compatible  = "dlg,da9062-rtc",
-       },
-       {
-               .name           = "da9062-onkey",
-               .num_resources  = ARRAY_SIZE(da9062_onkey_resources),
-               .resources      = da9062_onkey_resources,
-               .of_compatible  = "dlg,da9062-onkey",
-       },
-       {
-               .name           = "da9062-gpio",
-               .num_resources  = ARRAY_SIZE(da9062_gpio_resources),
-               .resources      = da9062_gpio_resources,
-               .of_compatible  = "dlg,da9062-gpio",
-       },
+       MFD_CELL_OF("da9062-core", da9062_core_resources, NULL, 0, 0,
+                   NULL),
+       MFD_CELL_OF("da9062-regulators", da9062_regulators_resources, NULL, 0, 0,
+                   NULL),
+       MFD_CELL_OF("da9062-watchdog", da9062_wdt_resources, NULL, 0, 0,
+                   "dlg,da9062-watchdog"),
+       MFD_CELL_OF("da9062-thermal", da9062_thermal_resources, NULL, 0, 0,
+                   "dlg,da9062-thermal"),
+       MFD_CELL_OF("da9062-rtc", da9062_rtc_resources, NULL, 0, 0,
+                   "dlg,da9062-rtc"),
+       MFD_CELL_OF("da9062-onkey", da9062_onkey_resources, NULL, 0, 0,
+                   "dlg,da9062-onkey"),
+       MFD_CELL_OF("da9062-gpio", da9062_gpio_resources, NULL, 0, 0,
+                   "dlg,da9062-gpio"),
 };
 
 static int da9062_clear_fault_log(struct da9062 *chip)