diff options
author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-02-03 06:05:37 -0500 |
---|---|---|
committer | Samuel Ortiz <sameo@linux.intel.com> | 2012-03-06 12:46:29 -0500 |
commit | 0dcc9a9d83dde6e34429b1914c9ac10aa447c7cb (patch) | |
tree | 4ba74f9fba2374ddde8341b40dd5ee7ae0e16b7e /drivers/mfd/twl-core.c | |
parent | b01543dfe67bb1d191998e90d20534dc354de059 (diff) |
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 <sfr@canb.auug.org.au>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Diffstat (limited to 'drivers/mfd/twl-core.c')
-rw-r--r-- | 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 8ce3959c6919..c1e4f1a277e9 100644 --- a/drivers/mfd/twl-core.c +++ b/drivers/mfd/twl-core.c | |||
@@ -753,9 +753,9 @@ add_children(struct twl4030_platform_data *pdata, unsigned long features) | |||
753 | 753 | ||
754 | /* we need to connect regulators to this transceiver */ | 754 | /* we need to connect regulators to this transceiver */ |
755 | if (twl_has_regulator() && child) { | 755 | if (twl_has_regulator() && child) { |
756 | usb1v5.dev = child; | 756 | usb1v5.dev_name = dev_name(child); |
757 | usb1v8.dev = child; | 757 | usb1v8.dev_name = dev_name(child); |
758 | usb3v1.dev = child; | 758 | usb3v1.dev_name = dev_name(child); |
759 | } | 759 | } |
760 | } | 760 | } |
761 | if (twl_has_usb() && pdata->usb && twl_class_is_6030()) { | 761 | if (twl_has_usb() && pdata->usb && twl_class_is_6030()) { |
@@ -801,7 +801,7 @@ add_children(struct twl4030_platform_data *pdata, unsigned long features) | |||
801 | return PTR_ERR(child); | 801 | return PTR_ERR(child); |
802 | /* we need to connect regulators to this transceiver */ | 802 | /* we need to connect regulators to this transceiver */ |
803 | if (twl_has_regulator() && child) | 803 | if (twl_has_regulator() && child) |
804 | usb3v3.dev = child; | 804 | usb3v3.dev_name = dev_name(child); |
805 | } else if (twl_has_regulator() && twl_class_is_6030()) { | 805 | } else if (twl_has_regulator() && twl_class_is_6030()) { |
806 | if (features & TWL6025_SUBCLASS) | 806 | if (features & TWL6025_SUBCLASS) |
807 | child = add_regulator(TWL6025_REG_LDOUSB, | 807 | child = add_regulator(TWL6025_REG_LDOUSB, |