diff options
| author | Mark Brown | 2012-02-03 12:02:58 +0100 |
|---|---|---|
| committer | Mark Brown | 2012-02-03 12:11:09 +0100 |
| commit | 1b65fa8496059d919a16b8431672d11e199ae515 (patch) | |
| tree | 634cc3917e47c08369edcfb8ee300577145b8cdd | |
| parent | regulator: Remove support for supplies specified by struct device (diff) | |
| download | kernel-qcow2-linux-1b65fa8496059d919a16b8431672d11e199ae515.tar.gz kernel-qcow2-linux-1b65fa8496059d919a16b8431672d11e199ae515.tar.xz kernel-qcow2-linux-1b65fa8496059d919a16b8431672d11e199ae515.zip | |
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>
| -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 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) /* 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, |