regulator: make 88pm860x sharing one driver structure

Remove a lot of driver structures in 88pm860x driver. Make regulators share
one driver structure.

Signed-off-by: Haojian Zhuang <haojian.zhuang@marvell.com>
Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Liam Girdwood <lrg@slimlogic.co.uk>

1 files changed, 17 insertions, 17 deletions

diff --git a/drivers/mfd/88pm860x-core.c b/drivers/mfd/88pm860x-core.c
index 6a14d2b1ccf0..21de38daf948 100644
--- a/drivers/mfd/88pm860x-core.c
+++ b/drivers/mfd/88pm860x-core.c
@@ -176,30 +176,30 @@ static struct resource regulator_resources[] = {
         PM8607_REG_RESOURCE(LDO14, LDO14),
 };
 
-#define PM8607_REG_DEVS(_name, _id)                                     \
+#define PM8607_REG_DEVS(_id)                                            \
 {                                                                       \
-        .name           = "88pm8607-" #_name,                           \
+        .name           = "88pm860x-regulator",                         \
         .num_resources  = 1,                                            \
         .resources      = &regulator_resources[PM8607_ID_##_id],        \
         .id             = PM8607_ID_##_id,                              \
 }
 
 static struct mfd_cell regulator_devs[] = {
-        PM8607_REG_DEVS(buck1, BUCK1),
-        PM8607_REG_DEVS(buck2, BUCK2),
-        PM8607_REG_DEVS(buck3, BUCK3),
-        PM8607_REG_DEVS(ldo1,  LDO1),
-        PM8607_REG_DEVS(ldo2,  LDO2),
-        PM8607_REG_DEVS(ldo3,  LDO3),
-        PM8607_REG_DEVS(ldo4,  LDO4),
-        PM8607_REG_DEVS(ldo5,  LDO5),
-        PM8607_REG_DEVS(ldo6,  LDO6),
-        PM8607_REG_DEVS(ldo7,  LDO7),
-        PM8607_REG_DEVS(ldo8,  LDO8),
-        PM8607_REG_DEVS(ldo9,  LDO9),
-        PM8607_REG_DEVS(ldo10, LDO10),
-        PM8607_REG_DEVS(ldo12, LDO12),
-        PM8607_REG_DEVS(ldo14, LDO14),
+        PM8607_REG_DEVS(BUCK1),
+        PM8607_REG_DEVS(BUCK2),
+        PM8607_REG_DEVS(BUCK3),
+        PM8607_REG_DEVS(LDO1),
+        PM8607_REG_DEVS(LDO2),
+        PM8607_REG_DEVS(LDO3),
+        PM8607_REG_DEVS(LDO4),
+        PM8607_REG_DEVS(LDO5),
+        PM8607_REG_DEVS(LDO6),
+        PM8607_REG_DEVS(LDO7),
+        PM8607_REG_DEVS(LDO8),
+        PM8607_REG_DEVS(LDO9),
+        PM8607_REG_DEVS(LDO10),
+        PM8607_REG_DEVS(LDO12),
+        PM8607_REG_DEVS(LDO14),
 };
 
 struct pm860x_irq_data {