diff options
| author | Nishanth Menon <nm@ti.com> | 2014-06-30 11:57:37 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-07-03 10:25:56 -0400 |
| commit | 6839cd6f6487969e969ced2245bfdabaf7005f6b (patch) | |
| tree | 07eb2d2ba8c309b71220d6f52aacfa5228c5bb25 /drivers/regulator/palmas-regulator.c | |
| parent | cf910b6b7101dae5eabaf2249b427e7698095abd (diff) | |
regulator: palmas: Rename palmas_regs_info to palmas_generic_regs_info
With commit d6f83370ed978d5570b7c8c22988310cb9376202 (regulator: palmas:
Add tps65917 PMIC support) palmas_regs_info naming is confusing as it is
a driver data parameter and a local variable. To prevent mistaken
updates, rename the local variable to palmas_generic_regs_info.
Signed-off-by: Nishanth Menon <nm@ti.com>
Tested-by: Stephen Warren <swarren@nvidia.com>
Tested-by: Keerthy <j-keerthy@ti.com>
Signed-off-by: Mark Brown <broonie@linaro.org>
Diffstat (limited to 'drivers/regulator/palmas-regulator.c')
| -rw-r--r-- | drivers/regulator/palmas-regulator.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/regulator/palmas-regulator.c b/drivers/regulator/palmas-regulator.c index f75fb90d7db3..d6b734f397dc 100644 --- a/drivers/regulator/palmas-regulator.c +++ b/drivers/regulator/palmas-regulator.c | |||
| @@ -41,7 +41,7 @@ static const struct regulator_linear_range smps_high_ranges[] = { | |||
| 41 | REGULATOR_LINEAR_RANGE(3300000, 0x7A, 0x7f, 0), | 41 | REGULATOR_LINEAR_RANGE(3300000, 0x7A, 0x7f, 0), |
| 42 | }; | 42 | }; |
| 43 | 43 | ||
| 44 | static struct palmas_regs_info palmas_regs_info[] = { | 44 | static struct palmas_regs_info palmas_generic_regs_info[] = { |
| 45 | { | 45 | { |
| 46 | .name = "SMPS12", | 46 | .name = "SMPS12", |
| 47 | .sname = "smps1-in", | 47 | .sname = "smps1-in", |
| @@ -1417,7 +1417,7 @@ static struct palmas_pmic_driver_data palmas_ddata = { | |||
| 1417 | .ldo_begin = PALMAS_REG_LDO1, | 1417 | .ldo_begin = PALMAS_REG_LDO1, |
| 1418 | .ldo_end = PALMAS_REG_LDOUSB, | 1418 | .ldo_end = PALMAS_REG_LDOUSB, |
| 1419 | .max_reg = PALMAS_NUM_REGS, | 1419 | .max_reg = PALMAS_NUM_REGS, |
| 1420 | .palmas_regs_info = palmas_regs_info, | 1420 | .palmas_regs_info = palmas_generic_regs_info, |
| 1421 | .palmas_matches = palmas_matches, | 1421 | .palmas_matches = palmas_matches, |
| 1422 | .sleep_req_info = palma_sleep_req_info, | 1422 | .sleep_req_info = palma_sleep_req_info, |
| 1423 | .smps_register = palmas_smps_registration, | 1423 | .smps_register = palmas_smps_registration, |