summaryrefslogtreecommitdiffstats
path: root/drivers/regulator/s2mps11.c
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2014-03-26 16:57:44 +0000
committerMark Brown <broonie@linaro.org>2014-03-26 16:57:44 +0000
commit29dbdcf3163bc05aad758e978abb66cf161e6d0e (patch)
tree9f017b0482de728a1b1b8205485b087b94a2b7f0 /drivers/regulator/s2mps11.c
parentb098d6726bbfb94c06d6e1097466187afddae61f (diff)
parent8669544a788a2d9de14cdbb3069b71ddc326e66f (diff)
downloadlinux-29dbdcf3163bc05aad758e978abb66cf161e6d0e.tar.bz2
Merge remote-tracking branch 'regulator/topic/core' into regulator-next
Diffstat (limited to 'drivers/regulator/s2mps11.c')
-rw-r--r--drivers/regulator/s2mps11.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/regulator/s2mps11.c b/drivers/regulator/s2mps11.c
index cd0b9e35a56d..89966213315c 100644
--- a/drivers/regulator/s2mps11.c
+++ b/drivers/regulator/s2mps11.c
@@ -65,7 +65,7 @@ static int s2mps11_regulator_set_voltage_time_sel(struct regulator_dev *rdev,
unsigned int ramp_delay = 0;
int old_volt, new_volt;
- switch (rdev->desc->id) {
+ switch (rdev_get_id(rdev)) {
case S2MPS11_BUCK2:
ramp_delay = s2mps11->ramp_delay2;
break;
@@ -105,7 +105,7 @@ static int s2mps11_set_ramp_delay(struct regulator_dev *rdev, int ramp_delay)
unsigned int ramp_enable = 1, enable_shift = 0;
int ret;
- switch (rdev->desc->id) {
+ switch (rdev_get_id(rdev)) {
case S2MPS11_BUCK1:
if (ramp_delay > s2mps11->ramp_delay16)
s2mps11->ramp_delay16 = ramp_delay;