Skip to contentSkip to conversation

ARM: U300: Don't specify regulator consumers by struct device

PATCH In review Axel Lin 3 participants 4 messages Feb 17, 2012

Subsystems (3)
Arm (32-bit) Arm sub-architectures Arm i.MX and Layerscape
lore
Share & tools
lore

Axel Lin

author
#0 lore raw

PATCH 1/2 ARM: U300: Don't specify regulator consumers by struct device

The dev field is remove from struct regulator_consumer_supply since commit 737f36 "regulator: Remove support for supplies specified by struct device".

This fixes below build error:
CC arch/arm/mach-u300/i2c.o
arch/arm/mach-u300/i2c.c:63: error: unknown field 'dev' specified in initializer arch/arm/mach-u300/i2c.c:95: error: unknown field 'dev' specified in initializer make[1]: *** [arch/arm/mach-u300/i2c.o] Error 1
make: *** [arch/arm/mach-u300] Error 2

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

---
This patch is against linux-next 20120217.

 arch/arm/mach-u300/i2c.c |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)
arch/arm/mach-u300/i2c.c +0 -2
index 5140dee..a38f802 100644
@@ -60,7 +60,6 @@ static struct regulator_consumer_supply supply_ldo_c[] = {
  */
 static struct regulator_consumer_supply supply_ldo_d[] = {
 	{
-		.dev = NULL,
 		.supply = "vana15", /* Powers the SoC (CPU etc) */
 	},
 };

@@ -92,7 +91,6 @@ static struct regulator_consumer_supply supply_ldo_k[] = {
  */
 static struct regulator_consumer_supply supply_ldo_ext[] = {
 	{
-		.dev = NULL,
 		.supply = "vext", /* External power */
 	},
 };
Signature · 1 line
1.7.5.4
author
#1 lore raw

PATCH 2/2 ARM: imx/pcm038: Don't specify regulator consumers by struct device

The dev field is remove from struct regulator_consumer_supply since commit 737f36 "regulator: Remove support for supplies specified by struct device".

This fixes below build error:
CC arch/arm/mach-imx/mach-pcm038.o
arch/arm/mach-imx/mach-pcm038.c:236: error: unknown field 'dev' specified in initializer make[1]: *** [arch/arm/mach-imx/mach-pcm038.o] Error 1
make: *** [arch/arm/mach-imx] Error 2

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

---
This patch is against linux-next 20120217.

 arch/arm/mach-imx/mach-pcm038.c |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)
arch/arm/mach-imx/mach-pcm038.c +0 -1
index 16f126d..bfcc1ea 100644
@@ -233,7 +233,6 @@ static struct regulator_init_data sdhc1_data = {
 
 static struct regulator_consumer_supply cam_consumers[] = {
 	{
-		.dev	= NULL,
 		.supply	= "imx_cam_vcc",
 	},
 };
Signature · 1 line
1.7.5.4
maintainer
#2 lore raw

Re: [PATCH 2/2] ARM: imx/pcm038: Don't specify regulator consumers by struct device

Quoted 8 lines · Axel Lin

The dev field is remove from struct regulator_consumer_supply since commit 737f36 "regulator: Remove support for supplies specified by struct device".

This fixes below build error:
CC arch/arm/mach-imx/mach-pcm038.o
arch/arm/mach-imx/mach-pcm038.c:236: error: unknown field 'dev' specified in initializer make[1]: *** [arch/arm/mach-imx/mach-pcm038.o] Error 1
make: *** [arch/arm/mach-imx] Error 2

This is a duplicate of one of Fabios patches, I just sent a pull request.

Sascha

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

---
This patch is against linux-next 20120217.

 arch/arm/mach-imx/mach-pcm038.c |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)
arch/arm/mach-imx/mach-pcm038.c +0 -1
index 16f126d..bfcc1ea 100644
@@ -233,7 +233,6 @@ static struct regulator_init_data sdhc1_data = {
 
 static struct regulator_consumer_supply cam_consumers[] = {
 	{
-		.dev	= NULL,
 		.supply	= "imx_cam_vcc",
 	},
 };
Signature · 1 line
1.7.5.4
Signature · 4 lines
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |
#3 lore raw
In reply to Axel Lin
Quoted 2 lines · Axel Lin

The dev field is remove from struct regulator_consumer_supply since commit 737f36 "regulator: Remove support for supplies specified by struct device".

Applied, thanks.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20120217/5b548ca0/attachment.sig>