diff options
| author |   Thiago Farina <tfarina@chromium.org> | 2014-01-26 21:57:12 -0200 |
|---|---|---|
| committer |   Mark Brown <broonie@linaro.org> | 2014-02-03 12:29:25 +0000 |
| commit | d55efa4d9bff20c98ca05e0bf458691e6869b5a1 (patch) | |
| tree | daf804222104f39c77cc2c4527e2087b46b27bdc | |
| parent | Linus 3.14-rc1 (diff) | |
| download | linux-dev-d55efa4d9bff20c98ca05e0bf458691e6869b5a1.tar.xz linux-dev-d55efa4d9bff20c98ca05e0bf458691e6869b5a1.zip | |
regulator: Make use of rdev_get_id() function where possible.
Signed-off-by: Thiago Farina <tfarina@chromium.org>
Signed-off-by: Mark Brown <broonie@linaro.org>
| -rw-r--r-- | drivers/regulator/pfuze100-regulator.c | 2 | ||||
| -rw-r--r-- | drivers/regulator/s2mps11.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/regulator/pfuze100-regulator.c b/drivers/regulator/pfuze100-regulator.c index ab174f20ca11..b699d4e7acc5 100644 --- a/drivers/regulator/pfuze100-regulator.c +++ b/drivers/regulator/pfuze100-regulator.c @@ -92,7 +92,7 @@ MODULE_DEVICE_TABLE(of, pfuze_dt_ids); static int pfuze100_set_ramp_delay(struct regulator_dev *rdev, int ramp_delay) { struct pfuze_chip *pfuze100 = rdev_get_drvdata(rdev); - int id = rdev->desc->id; + int id = rdev_get_id(rdev); unsigned int ramp_bits; int ret; diff --git a/drivers/regulator/s2mps11.c b/drivers/regulator/s2mps11.c index d9e557990577..7e110b91be51 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; |