From: Igor Grinberg <grinberg@compulab•co.il>
To: Paul Gortmaker <paul.gortmaker@windriver•com>
Cc: linux-arm-kernel@lists•infradead.org, linux-next@vger•kernel.org,
Mark Brown <broonie@opensource•wolfsonmicro.com>,
Haojian Zhuang <haojian.zhuang@marvell•com>,
Haojian Zhuang <haojian.zhuang@gmail•com>
Subject: Re: [PATCH] ARM: pxa: fix build failure for regulator consumer in em-x270.c
Date: Tue, 06 Mar 2012 10:46:19 +0200 [thread overview]
Message-ID: <4F55CEDB.90909@compulab.co.il> (raw)
In-Reply-To: <1330989122-6323-1-git-send-email-paul.gortmaker@windriver.com>
Also Cc: Haojian Zhuang <haojian.zhuang@marvell•com>
On 03/06/12 01:12, Paul Gortmaker wrote:
> Commit 737f360d5bef5e01c6cfa755dca0b449a154c1e0 (linux-next)
>
> "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. Strip them out here too.
>
> Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver•com>
> CC: Mark Brown <broonie@opensource•wolfsonmicro.com>
You've missed the scissors line:
---
The patch itself:
Acked-by: Igor Grinberg <grinberg@compulab•co.il>
Thanks
>
> diff --git a/arch/arm/mach-pxa/em-x270.c b/arch/arm/mach-pxa/em-x270.c
> index d80c0ba..c8f3293 100644
> --- a/arch/arm/mach-pxa/em-x270.c
> +++ b/arch/arm/mach-pxa/em-x270.c
> @@ -1083,20 +1083,19 @@ static void __init em_x270_userspace_consumers_init(void)
> }
>
> /* DA9030 related initializations */
> -#define REGULATOR_CONSUMER(_name, _dev, _supply) \
> +#define REGULATOR_CONSUMER(_name, _supply) \
> static struct regulator_consumer_supply _name##_consumers[] = { \
> { \
> - .dev = _dev, \
> .supply = _supply, \
> }, \
> }
>
> -REGULATOR_CONSUMER(ldo3, &em_x270_gps_userspace_consumer.dev, "vcc gps");
> -REGULATOR_CONSUMER(ldo5, NULL, "vcc cam");
> -REGULATOR_CONSUMER(ldo10, &pxa_device_mci.dev, "vcc sdio");
> -REGULATOR_CONSUMER(ldo12, NULL, "vcc usb");
> -REGULATOR_CONSUMER(ldo19, &em_x270_gprs_userspace_consumer.dev, "vcc gprs");
> -REGULATOR_CONSUMER(buck2, NULL, "vcc_core");
> +REGULATOR_CONSUMER(ldo3, "vcc gps");
> +REGULATOR_CONSUMER(ldo5, "vcc cam");
> +REGULATOR_CONSUMER(ldo10, "vcc sdio");
> +REGULATOR_CONSUMER(ldo12, "vcc usb");
> +REGULATOR_CONSUMER(ldo19, "vcc gprs");
> +REGULATOR_CONSUMER(buck2, "vcc_core");
>
> #define REGULATOR_INIT(_ldo, _min_uV, _max_uV, _ops_mask) \
> static struct regulator_init_data _ldo##_data = { \
--
Regards,
Igor.
next prev parent reply other threads:[~2012-03-06 8:46 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-03-05 23:12 [PATCH] ARM: pxa: fix build failure for regulator consumer in em-x270.c Paul Gortmaker
2012-03-06 8:46 ` Igor Grinberg [this message]
2012-03-06 9:12 ` Haojian Zhuang
2012-03-06 12:16 ` Mark Brown
2012-03-06 12:22 ` Haojian Zhuang
2012-03-07 0:10 ` Paul Gortmaker
2012-03-08 22:06 ` Paul Gortmaker
2012-03-28 15:21 ` Igor Grinberg
2012-03-28 15:27 ` Mark Brown
2012-03-28 15:37 ` Haojian Zhuang
2012-03-28 15:39 ` Mark Brown
2012-03-28 15:59 ` Paul Gortmaker
2012-03-28 16:13 ` Mark Brown
2012-03-28 16:59 ` Paul Gortmaker
2012-03-29 14:28 ` Igor Grinberg
2012-03-29 14:54 ` Mark Brown
2012-03-29 14:57 ` Paul Gortmaker
2012-03-29 15:11 ` Mark Brown
2012-03-29 14:55 ` Paul Gortmaker
2012-03-30 11:25 ` Igor Grinberg
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=4F55CEDB.90909@compulab.co.il \
--to=grinberg@compulab$(echo .)co.il \
--cc=broonie@opensource$(echo .)wolfsonmicro.com \
--cc=haojian.zhuang@gmail$(echo .)com \
--cc=haojian.zhuang@marvell$(echo .)com \
--cc=linux-arm-kernel@lists$(echo .)infradead.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=paul.gortmaker@windriver$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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