Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3a569132 authored by Paul Gortmaker's avatar Paul Gortmaker Committed by Haojian Zhuang
Browse files

ARM: pxa: fix regulator related build fail in magician_defconfig 



commit 737f360d (linux-next)

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

deletes the field from the struct, but this platform was still trying
to set those fields.  Delete the assignments.

arch/arm/mach-pxa/magician.c:581: error: unknown field 'dev' specified in initializer
arch/arm/mach-pxa/magician.c:581: warning: initialization from incompatible pointer type
arch/arm/mach-pxa/magician.c:585: error: unknown field 'dev' specified in initializer
arch/arm/mach-pxa/magician.c:585: warning: initialization from incompatible pointer type

arch/arm/mach-pxa/hx4700.c:683: error: unknown field 'dev' specified in initializer
arch/arm/mach-pxa/hx4700.c:683: warning: initialization from incompatible pointer type
arch/arm/mach-pxa/hx4700.c:687: error: unknown field 'dev' specified in initializer
arch/arm/mach-pxa/hx4700.c:687: warning: initialization from incompatible pointer type

Signed-off-by: default avatarPaul Gortmaker <paul.gortmaker@windriver.com>
Signed-off-by: default avatarHaojian Zhuang <haojian.zhuang@gmail.com>
parent c16fa4f2

arch/arm/mach-pxa/hx4700.c

+0 −2
Original line number Diff line number Diff line
@@ -664,11 +664,9 @@ static struct platform_device power_supply = { 


static struct regulator_consumer_supply bq24022_consumers[] = {

	{

		.dev = &gpio_vbus.dev,

		.supply = "vbus_draw",

	},

	{

		.dev = &power_supply.dev,

		.supply = "ac_draw",

	},

};

arch/arm/mach-pxa/magician.c

+0 −2
Original line number Diff line number Diff line
@@ -578,11 +578,9 @@ static struct platform_device power_supply = { 


static struct regulator_consumer_supply bq24022_consumers[] = {

	{

		.dev = &gpio_vbus.dev,

		.supply = "vbus_draw",

	},

	{

		.dev = &power_supply.dev,

		.supply = "ac_draw",

	},

};