From: paul.gortmaker@windriver.com (Paul Gortmaker)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH] ARM: pxa: fix regulator related build fail in magician_defconfig
Date: Thu, 8 Mar 2012 16:34:54 -0500 [thread overview]
Message-ID: <1331242494-3157-1-git-send-email-paul.gortmaker@windriver.com> (raw)
In-Reply-To: <1331084814.11802.YahooMailClassic@web29012.mail.ird.yahoo.com>
commit 737f360d5bef5e01c6cfa755dca0b449a154c1e0 (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. Convert them to use the REGULATOR_SUPPLY macro.
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: Paul Gortmaker <paul.gortmaker@windriver.com>
---
[v3: fix arg2 in REGULATOR_SUPPLY to have correct names ]
diff --git a/arch/arm/mach-pxa/hx4700.c b/arch/arm/mach-pxa/hx4700.c
index f2c23ea..b6a338b 100644
--- a/arch/arm/mach-pxa/hx4700.c
+++ b/arch/arm/mach-pxa/hx4700.c
@@ -679,14 +679,8 @@ 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",
- },
+ REGULATOR_SUPPLY("vbus_draw", "gpio-vbus"),
+ REGULATOR_SUPPLY("ac_draw", "pda-power"),
};
static struct regulator_init_data bq24022_init_data = {
diff --git a/arch/arm/mach-pxa/magician.c b/arch/arm/mach-pxa/magician.c
index 3d6baf9..1a18e63 100644
--- a/arch/arm/mach-pxa/magician.c
+++ b/arch/arm/mach-pxa/magician.c
@@ -577,14 +577,8 @@ 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",
- },
+ REGULATOR_SUPPLY("vbus_draw", "gpio-vbus"),
+ REGULATOR_SUPPLY("ac_draw", "pda-power"),
};
static struct regulator_init_data bq24022_init_data = {
--
1.7.9.1
next prev parent reply other threads:[~2012-03-08 21:34 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-03-06 19:46 [PATCH] ARM: pxa: fix regulator related build fail in magician_defconfig Paul Gortmaker
2012-03-06 20:01 ` Mark Brown
2012-03-06 20:49 ` [PATCH v2] " Paul Gortmaker
2012-03-07 1:46 ` Paul Parsons
2012-03-07 14:46 ` Paul Gortmaker
2012-03-07 14:57 ` Mark Brown
2012-03-08 21:34 ` Paul Gortmaker [this message]
2012-03-09 2:47 ` [PATCH] " Paul Parsons
2012-03-14 8:38 ` Haojian Zhuang
2012-03-14 12:30 ` Paul Gortmaker
2012-03-14 12:32 ` Mark Brown
2012-03-28 9:43 ` Russell King - ARM Linux
2012-03-28 10:18 ` Mark Brown
2012-03-28 13:36 ` Haojian Zhuang
2012-03-28 17:56 ` Russell King - ARM Linux
2012-03-28 18:10 ` Mark Brown
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1331242494-3157-1-git-send-email-paul.gortmaker@windriver.com \
--to=paul.gortmaker@windriver.com \
--cc=linux-arm-kernel@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).