ARM: pxa: fix build failure for regulator consumer in em-x270.c
authorPaul Gortmaker <paul.gortmaker@windriver.com>
Fri, 30 Mar 2012 00:41:02 +0000 (08:41 +0800)
committerHaojian Zhuang <haojian.zhuang@gmail.com>
Fri, 30 Mar 2012 00:41:18 +0000 (08:41 +0800)
Commit 737f360d5bef5e01c6cfa755dca0b449a154c1e0

"regulator: Remove support for supplies specified by struct device"

caused this file to break, since it was still relying on the
device field to be present.  Map it onto dev_name appropriately

Since there are two consumers with the name "reg-userspace-consumer",
we have to supply the ID as a suffix in the REGULATOR_CONSUMER calls.

Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
CC: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Haojian Zhuang <haojian.zhuang@gmail.com>
arch/arm/mach-pxa/em-x270.c

index d80c0ba9a0955613a2f393f5fefd1d882483ad52..b88e11cd75ed0f830e8c7e95bcdbf910d7876cda 100644 (file)
@@ -1083,19 +1083,19 @@ static void __init em_x270_userspace_consumers_init(void)
 }
 
 /* DA9030 related initializations */
 }
 
 /* DA9030 related initializations */
-#define REGULATOR_CONSUMER(_name, _dev, _supply)                              \
+#define REGULATOR_CONSUMER(_name, _dev_name, _supply)                  \
        static struct regulator_consumer_supply _name##_consumers[] = { \
                {                                                       \
        static struct regulator_consumer_supply _name##_consumers[] = { \
                {                                                       \
-                       .dev = _dev,                                    \
+                       .dev_name = _dev_name,                          \
                        .supply = _supply,                              \
                },                                                      \
        }
 
                        .supply = _supply,                              \
                },                                                      \
        }
 
-REGULATOR_CONSUMER(ldo3, &em_x270_gps_userspace_consumer.dev, "vcc gps");
+REGULATOR_CONSUMER(ldo3, "reg-userspace-consumer.0", "vcc gps");
 REGULATOR_CONSUMER(ldo5, NULL, "vcc cam");
 REGULATOR_CONSUMER(ldo5, NULL, "vcc cam");
-REGULATOR_CONSUMER(ldo10, &pxa_device_mci.dev, "vcc sdio");
+REGULATOR_CONSUMER(ldo10, "pxa2xx-mci", "vcc sdio");
 REGULATOR_CONSUMER(ldo12, NULL, "vcc usb");
 REGULATOR_CONSUMER(ldo12, NULL, "vcc usb");
-REGULATOR_CONSUMER(ldo19, &em_x270_gprs_userspace_consumer.dev, "vcc gprs");
+REGULATOR_CONSUMER(ldo19, "reg-userspace-consumer.1", "vcc gprs");
 REGULATOR_CONSUMER(buck2, NULL, "vcc_core");
 
 #define REGULATOR_INIT(_ldo, _min_uV, _max_uV, _ops_mask)              \
 REGULATOR_CONSUMER(buck2, NULL, "vcc_core");
 
 #define REGULATOR_INIT(_ldo, _min_uV, _max_uV, _ops_mask)              \