Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

regulator: rk808: Use rdev_get_id() to access id of regulator

RK808_ID_DCDC1 is 0, no need to do subtract RK808_ID_DCDC1.

Signed-off-by: Axel Lin <axel.lin@ingics.com>
Signed-off-by: Mark Brown <broonie@kernel.org>

authored by

Axel Lin and committed by
Mark Brown
bf8e2762 1001354c

+4 -5
+4 -5
drivers/regulator/rk808-regulator.c
··· 120 120 static int rk808_buck1_2_get_voltage_sel_regmap(struct regulator_dev *rdev) 121 121 { 122 122 struct rk808_regulator_data *pdata = rdev_get_drvdata(rdev); 123 - int id = rdev->desc->id - RK808_ID_DCDC1; 123 + int id = rdev_get_id(rdev); 124 124 struct gpio_desc *gpio = pdata->dvs_gpio[id]; 125 125 unsigned int val; 126 126 int ret; ··· 193 193 unsigned sel) 194 194 { 195 195 struct rk808_regulator_data *pdata = rdev_get_drvdata(rdev); 196 - int id = rdev->desc->id - RK808_ID_DCDC1; 196 + int id = rdev_get_id(rdev); 197 197 struct gpio_desc *gpio = pdata->dvs_gpio[id]; 198 198 unsigned int reg = rdev->desc->vsel_reg; 199 199 unsigned old_sel; ··· 232 232 unsigned int new_selector) 233 233 { 234 234 struct rk808_regulator_data *pdata = rdev_get_drvdata(rdev); 235 - int id = rdev->desc->id - RK808_ID_DCDC1; 235 + int id = rdev_get_id(rdev); 236 236 struct gpio_desc *gpio = pdata->dvs_gpio[id]; 237 237 238 238 /* if there is no dvs1/2 pin, we don't need wait extra time here. */ ··· 245 245 static int rk808_set_ramp_delay(struct regulator_dev *rdev, int ramp_delay) 246 246 { 247 247 unsigned int ramp_value = RK808_RAMP_RATE_10MV_PER_US; 248 - unsigned int reg = rk808_buck_config_regs[rdev->desc->id - 249 - RK808_ID_DCDC1]; 248 + unsigned int reg = rk808_buck_config_regs[rdev_get_id(rdev)]; 250 249 251 250 switch (ramp_delay) { 252 251 case 1 ... 2000: