---
 arch/arm/mach-pxa/balloon3.c  |    4 +---
 arch/arm/mach-pxa/cm-x300.c   |    4 +---
 arch/arm/mach-pxa/em-x270.c   |    5 +----
 arch/arm/mach-pxa/hx4700.c    |   13 ++++---------
 arch/arm/mach-pxa/magician.c  |    8 ++------
 arch/arm/mach-pxa/mioa701.c   |    4 +---
 arch/arm/mach-pxa/palm27x.c   |    4 +---
 arch/arm/mach-pxa/spitz.c     |    4 +---
 arch/arm/mach-pxa/stargate2.c |    5 +----
 arch/arm/mach-pxa/vpac270.c   |    4 +---
 arch/arm/mach-pxa/z2.c        |    4 +---
 11 files changed, 15 insertions(+), 44 deletions(-)

arch/arm/mach-pxa/balloon3.c +1 -3

index 7ece2625..9244493 100644
@@ -729,9 +729,7 @@ static inline void balloon3_nand_init(void) {}
 #if defined(CONFIG_REGULATOR_MAX1586) || \
     defined(CONFIG_REGULATOR_MAX1586_MODULE)
 static struct regulator_consumer_supply balloon3_max1587a_consumers[] = {
-	{
-		.supply	= "vcc_core",
-	}
+	REGULATOR_SUPPLY("vcc_core", NULL),
 };
 
 static struct regulator_init_data balloon3_max1587a_v3_info = {

arch/arm/mach-pxa/cm-x300.c +1 -3

index 3132740..3e4e9fe 100644
@@ -713,9 +713,7 @@ struct da9030_battery_info cm_x300_battery_info = {
 };
 
 static struct regulator_consumer_supply buck2_consumers[] = {
-	{
-		.supply = "vcc_core",
-	},
+	REGULATOR_SUPPLY("vcc_core", NULL),
 };
 
 static struct regulator_init_data buck2_data = {

arch/arm/mach-pxa/em-x270.c +1 -4

index 2771ad4..97f82ad 100644
@@ -1082,10 +1082,7 @@ static void __init em_x270_userspace_consumers_init(void)
 /* DA9030 related initializations */
 #define REGULATOR_CONSUMER(_name, _dev_name, _supply)		        \
 	static struct regulator_consumer_supply _name##_consumers[] = {	\
-		{							\
-			.dev_name = _dev_name,				\
-			.supply = _supply,				\
-		},							\
+		REGULATOR_SUPPLY(_supply, _dev_name),			\
 	}
 
 REGULATOR_CONSUMER(ldo3, "reg-userspace-consumer.0", "vcc gps");

arch/arm/mach-pxa/hx4700.c +4 -9

index b83b95a..88f0f51 100644
@@ -680,12 +680,8 @@ static struct platform_device power_supply = {
  */
 
 static struct regulator_consumer_supply bq24022_consumers[] = {
-	{
-		.supply = "vbus_draw",
-	},
-	{
-		.supply = "ac_draw",
-	},
+	REGULATOR_SUPPLY("vbus_draw", NULL),
+	REGULATOR_SUPPLY("ac_draw", NULL),
 };
 
 static struct regulator_init_data bq24022_init_data = {

@@ -764,9 +760,8 @@ static struct platform_device strataflash = {
  * Maxim MAX1587A on PI2C
  */
 
-static struct regulator_consumer_supply max1587a_consumer = {
-	.supply = "vcc_core",
-};
+static struct regulator_consumer_supply max1587a_consumer =
+	REGULATOR_SUPPLY("vcc_core", NULL);
 
 static struct regulator_init_data max1587a_v3_info = {
 	.constraints = {

arch/arm/mach-pxa/magician.c +2 -6

index 8de0651..2db697c 100644
@@ -579,12 +579,8 @@ static struct platform_device power_supply = {
  */
 
 static struct regulator_consumer_supply bq24022_consumers[] = {
-	{
-		.supply = "vbus_draw",
-	},
-	{
-		.supply = "ac_draw",
-	},
+	REGULATOR_SUPPLY("vbus_draw", NULL),
+	REGULATOR_SUPPLY("ac_draw", NULL),
 };
 
 static struct regulator_init_data bq24022_init_data = {

arch/arm/mach-pxa/mioa701.c +1 -3

index 061d570..6745149 100644
@@ -581,9 +581,7 @@ static struct wm97xx_pdata mioa701_wm97xx_pdata = {
  * Voltage regulation
  */
 static struct regulator_consumer_supply max1586_consumers[] = {
-	{
-		.supply = "vcc_core",
-	}
+	REGULATOR_SUPPLY("vcc_core", NULL),
 };
 
 static struct regulator_init_data max1586_v3_info = {

arch/arm/mach-pxa/palm27x.c +1 -3

index fbc10d7..dad71cf 100644
@@ -429,9 +429,7 @@ void __init palm27x_power_init(int ac, int usb)
 #if defined(CONFIG_REGULATOR_MAX1586) || \
     defined(CONFIG_REGULATOR_MAX1586_MODULE)
 static struct regulator_consumer_supply palm27x_max1587a_consumers[] = {
-	{
-		.supply	= "vcc_core",
-	}
+	REGULATOR_SUPPLY("vcc_core", NULL),
 };
 
 static struct regulator_init_data palm27x_max1587a_v3_info = {

arch/arm/mach-pxa/spitz.c +1 -3

index df2ab0f..363d91b 100644
@@ -877,9 +877,7 @@ static struct i2c_board_info spitz_i2c_devs[] = {
 };
 
 static struct regulator_consumer_supply isl6271a_consumers[] = {
-	{
-		.supply	= "vcc_core",
-	}
+	REGULATOR_SUPPLY("vcc_core", NULL),
 };
 
 static struct regulator_init_data isl6271a_info[] = {

arch/arm/mach-pxa/stargate2.c +1 -4

index 4cd645e..30b1b0b 100644
@@ -151,10 +151,7 @@ static struct platform_device sht15 = {
 };
 
 static struct regulator_consumer_supply stargate2_sensor_3_con[] = {
-	{
-		.dev_name = "sht15",
-		.supply = "vcc",
-	},
+	REGULATOR_SUPPLY("vcc", "sht15"),
 };
 
 enum stargate2_ldos{

arch/arm/mach-pxa/vpac270.c +1 -3

index c57ab63..e1740ac 100644
@@ -640,9 +640,7 @@ static inline void vpac270_ide_init(void) {}
 #if defined(CONFIG_REGULATOR_MAX1586) || \
     defined(CONFIG_REGULATOR_MAX1586_MODULE)
 static struct regulator_consumer_supply vpac270_max1587a_consumers[] = {
-	{
-		.supply	= "vcc_core",
-	}
+	REGULATOR_SUPPLY("vcc_core", NULL),
 };
 
 static struct regulator_init_data vpac270_max1587a_v3_info = {

arch/arm/mach-pxa/z2.c +1 -3

index fa86199..b9320cb 100644
@@ -615,9 +615,7 @@ static inline void z2_spi_init(void) {}
 #if defined(CONFIG_REGULATOR_TPS65023) || \
 	defined(CONFIG_REGULATOR_TPS65023_MODULE)
 static struct regulator_consumer_supply z2_tps65021_consumers[] = {
-	{
-		.supply	= "vcc_core",
-	}
+	REGULATOR_SUPPLY("vcc_core", NULL),
 };
 
 static struct regulator_init_data z2_tps65021_info[] = {

Signature · 1 line

1.7.5.4

Robert Jarzmik

maintainer Acked-by on v1 1/1

2012-05-08 09:23 UTC #1 lore raw

For mioa701:

Acked-by Robert Jarzmik <[email protected]>

Cheers.

--
Robert

Jonathan Cameron

Acked-by

2012-05-08 09:26 UTC #2 lore raw

Quoted 2 lines · Robert Jarzmik

For mioa701:
Acked-by Robert Jarzmik<[email protected]>

For stargate2

Acked-by Jonathan Cameron <[email protected]>

Quoted 5 lines

Cheers.
--
Robert

Igor Grinberg

Acked-by on v1 1/1

2012-05-08 10:00 UTC #3 lore raw

In reply to Axel Lin

Quoted 1 line · Axel Lin

Signed-off-by Axel Lin <[email protected]>

[...]

Quoted 2 lines

 arch/arm/mach-pxa/cm-x300.c   |    4 +---
 arch/arm/mach-pxa/em-x270.c   |    5 +----

Acked-by Igor Grinberg <[email protected]>

[...]

Signature · 2 lines

Regards,
Igor.

Marek Vasut

Acked-by on v1 1/1

2012-05-08 10:22 UTC #4 lore raw

In reply to Axel Lin

Dear Axel Lin,

For:

Quoted 4 lines

 arch/arm/mach-pxa/balloon3.c  |    4 +---
 arch/arm/mach-pxa/palm27x.c   |    4 +---
 arch/arm/mach-pxa/vpac270.c   |    4 +---
 arch/arm/mach-pxa/z2.c        |    4 +---

Acked-by Marek Vasut <[email protected]>

Best regards,
Marek Vasut

Paul Parsons

Tested-by on v1 1/1

2012-05-08 13:57 UTC #5 lore raw

In reply to Axel Lin

Hello Axel,

Quoted 1 line · Axel Lin

arch/arm/mach-pxa/hx4700.c? ? |???13 ++++---------

The hx4700 patch works for me on linux-3.4.0-rc6.

Tested-by Paul Parsons <[email protected]>

Haojian Zhuang

maintainer Applied

2012-05-14 01:27 UTC #6 lore raw

Quoted 9 lines · Paul Parsons

Hello Axel,
Quoted 1 line · Axel Lin
?arch/arm/mach-pxa/hx4700.c? ? |???13 ++++---------
The hx4700 patch works for me on linux-3.4.0-rc6.
Tested-by Paul Parsons <[email protected]>

Applied

Regards
Haojian