2012-02-03 11:05:43

by Mark Brown

Subject: [PATCH] mfd: twl-core: Don't specify regulator consumers by struct device

This has been deprecated for considerable time now and support has been
removed from the regulator API. dev_name should be used instead.

Reported-by: Stephen Rothwell <[email protected]>
Signed-off-by: Mark Brown <[email protected]>
---

I'll apply this to the regulator tree as it's thrown up issues due to
the removal of dev from regulator_consumer_supply - please let me know
if this is an issue, I can back it out easily enough.

drivers/mfd/twl-core.c | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/mfd/twl-core.c b/drivers/mfd/twl-core.c
index e04e04dd..8dcf70f 100644
--- a/drivers/mfd/twl-core.c
+++ b/drivers/mfd/twl-core.c
@@ -751,9 +751,9 @@ add_children(struct twl4030_platform_data *pdata, unsigned long features)

/* we need to connect regulators to this transceiver */
if (twl_has_regulator() && child) {
- usb1v5.dev = child;
- usb1v8.dev = child;
- usb3v1.dev = child;
+ usb1v5.dev_name = dev_name(child);
+ usb1v8.dev_name = dev_name(child);
+ usb3v1.dev_name = dev_name(child);
}
}
if (twl_has_usb() && pdata->usb && twl_class_is_6030()) {
@@ -799,7 +799,7 @@ add_children(struct twl4030_platform_data *pdata, unsigned long features)
return PTR_ERR(child);
/* we need to connect regulators to this transceiver */
if (twl_has_regulator() && child)
- usb3v3.dev = child;
+ usb3v3.dev_name = dev_name(child);
} else if (twl_has_regulator() && twl_class_is_6030()) {
if (features & TWL6025_SUBCLASS)
child = add_regulator(TWL6025_REG_LDOUSB,
--
1.7.9.rc1

2012-02-03 11:29:49

by Peter Ujfalusi

Subject: Re: [PATCH] mfd: twl-core: Don't specify regulator consumers by struct device

On 02/03/2012 01:05 PM, Mark Brown wrote:
> This has been deprecated for considerable time now and support has been
> removed from the regulator API. dev_name should be used instead.

Tested-by: Peter Ujfalusi <[email protected]>

2012-02-03 18:02:11

by Samuel Ortiz

Subject: Re: [PATCH] mfd: twl-core: Don't specify regulator consumers by struct device

Hi Mark,

On Fri, Feb 03, 2012 at 11:05:37AM +0000, Mark Brown wrote:
> This has been deprecated for considerable time now and support has been
> removed from the regulator API. dev_name should be used instead.
Thanks for the quick fix. I applied this one to my for-next branch as well.


> Reported-by: Stephen Rothwell <[email protected]>
> Signed-off-by: Mark Brown <[email protected]>
> ---
>
> I'll apply this to the regulator tree as it's thrown up issues due to
> the removal of dev from regulator_consumer_supply - please let me know
> if this is an issue, I can back it out easily enough.
When did the regulator API get modified ? During the last merge window, or is
this one something Linus should be pulling ASAP ?

Cheers,
Samuel.

--
Intel Open Source Technology Centre
http://oss.intel.com/

2012-02-03 19:05:29

by Mark Brown

Subject: Re: [PATCH] mfd: twl-core: Don't specify regulator consumers by struct device

On Fri, Feb 03, 2012 at 07:08:50PM +0100, Samuel Ortiz wrote:
> On Fri, Feb 03, 2012 at 11:05:37AM +0000, Mark Brown wrote:

> > I'll apply this to the regulator tree as it's thrown up issues due to
> > the removal of dev from regulator_consumer_supply - please let me know
> > if this is an issue, I can back it out easily enough.

> When did the regulator API get modified ? During the last merge window, or is
> this one something Linus should be pulling ASAP ?

The API has been deprecated forever but it's only removed in -next.