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

regulator: tps65912: Convert to get_voltage_sel

Signed-off-by: Axel Lin <axel.lin@gmail.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

authored by

Axel Lin and committed by
Mark Brown 9db7f056 0f80ea14

+4 -4
+4 -4
drivers/regulator/tps65912-regulator.c
··· 405 405 return voltage; 406 406 } 407 407 408 - static int tps65912_get_voltage(struct regulator_dev *dev) 408 + static int tps65912_get_voltage_sel(struct regulator_dev *dev) 409 409 { 410 410 struct tps65912_reg *pmic = rdev_get_drvdata(dev); 411 411 struct tps65912 *mfd = pmic->mfd; ··· 419 419 vsel = tps65912_reg_read(mfd, reg); 420 420 vsel &= 0x3F; 421 421 422 - return tps65912_list_voltage(dev, vsel); 422 + return vsel; 423 423 } 424 424 425 425 static int tps65912_set_voltage_sel(struct regulator_dev *dev, ··· 444 444 .disable = tps65912_reg_disable, 445 445 .set_mode = tps65912_set_mode, 446 446 .get_mode = tps65912_get_mode, 447 - .get_voltage = tps65912_get_voltage, 447 + .get_voltage_sel = tps65912_get_voltage_sel, 448 448 .set_voltage_sel = tps65912_set_voltage_sel, 449 449 .list_voltage = tps65912_list_voltage, 450 450 }; ··· 454 454 .is_enabled = tps65912_reg_is_enabled, 455 455 .enable = tps65912_reg_enable, 456 456 .disable = tps65912_reg_disable, 457 - .get_voltage = tps65912_get_voltage, 457 + .get_voltage_sel = tps65912_get_voltage_sel, 458 458 .set_voltage_sel = tps65912_set_voltage_sel, 459 459 .list_voltage = tps65912_list_voltage, 460 460 };