aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/mfd/twl-core.c
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2012-02-03 06:02:58 -0500
committerMark Brown <broonie@opensource.wolfsonmicro.com>2012-02-03 06:11:09 -0500
commit1b65fa8496059d919a16b8431672d11e199ae515 (patch)
tree634cc3917e47c08369edcfb8ee300577145b8cdd /drivers/mfd/twl-core.c
parent737f360d5bef5e01c6cfa755dca0b449a154c1e0 (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. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'drivers/mfd/twl-core.c')
-rw-r--r--drivers/mfd/twl-core.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/mfd/twl-core.c b/drivers/mfd/twl-core.c
index e04e04ddc15e..8dcf70f8d659 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)
751 751
752 /* we need to connect regulators to this transceiver */ 752 /* we need to connect regulators to this transceiver */
753 if (twl_has_regulator() && child) { 753 if (twl_has_regulator() && child) {
754 usb1v5.dev = child; 754 usb1v5.dev_name = dev_name(child);
755 usb1v8.dev = child; 755 usb1v8.dev_name = dev_name(child);
756 usb3v1.dev = child; 756 usb3v1.dev_name = dev_name(child);
757 } 757 }
758 } 758 }
759 if (twl_has_usb() && pdata->usb && twl_class_is_6030()) { 759 if (twl_has_usb() && pdata->usb && twl_class_is_6030()) {
@@ -799,7 +799,7 @@ add_children(struct twl4030_platform_data *pdata, unsigned long features)
799 return PTR_ERR(child); 799 return PTR_ERR(child);
800 /* we need to connect regulators to this transceiver */ 800 /* we need to connect regulators to this transceiver */
801 if (twl_has_regulator() && child) 801 if (twl_has_regulator() && child)
802 usb3v3.dev = child; 802 usb3v3.dev_name = dev_name(child);
803 } else if (twl_has_regulator() && twl_class_is_6030()) { 803 } else if (twl_has_regulator() && twl_class_is_6030()) {
804 if (features & TWL6025_SUBCLASS) 804 if (features & TWL6025_SUBCLASS)
805 child = add_regulator(TWL6025_REG_LDOUSB, 805 child = add_regulator(TWL6025_REG_LDOUSB,