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

regulator: lp3971: Convert to get_voltage_sel

regulator_list_voltage_table() returns -EINVAL if selector >= n_voltages.
Thus we don't need to check if reg is greater than BUCK_TARGET_VOL_MAX_IDX in
lp3971_dcdc_get_voltage_sel.

BUCK_TARGET_VOL_MIN_IDX and BUCK_TARGET_VOL_MAX_IDX are not used, remove them.

Signed-off-by: Axel Lin <axel.lin@ingics.com>
Acked-by: Marek Szyprowski <m.szyprowski@samsung.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

authored by

Axel Lin and committed by
Mark Brown
f38482fa a49f0d1e

+6 -16
+6 -16
drivers/regulator/lp3971.c
··· 73 73 }; 74 74 75 75 #define BUCK_TARGET_VOL_MASK 0x3f 76 - #define BUCK_TARGET_VOL_MIN_IDX 0x01 77 - #define BUCK_TARGET_VOL_MAX_IDX 0x19 78 76 79 77 #define LP3971_BUCK_RAMP_REG(x) (buck_base_addr[x]+2) 80 78 ··· 138 140 return lp3971_set_bits(lp3971, LP3971_LDO_ENABLE_REG, mask, 0); 139 141 } 140 142 141 - static int lp3971_ldo_get_voltage(struct regulator_dev *dev) 143 + static int lp3971_ldo_get_voltage_sel(struct regulator_dev *dev) 142 144 { 143 145 struct lp3971 *lp3971 = rdev_get_drvdata(dev); 144 146 int ldo = rdev_get_id(dev) - LP3971_LDO1; ··· 147 149 reg = lp3971_reg_read(lp3971, LP3971_LDO_VOL_CONTR_REG(ldo)); 148 150 val = (reg >> LDO_VOL_CONTR_SHIFT(ldo)) & LDO_VOL_CONTR_MASK; 149 151 150 - return dev->desc->volt_table[val]; 152 + return val; 151 153 } 152 154 153 155 static int lp3971_ldo_set_voltage_sel(struct regulator_dev *dev, ··· 166 168 .is_enabled = lp3971_ldo_is_enabled, 167 169 .enable = lp3971_ldo_enable, 168 170 .disable = lp3971_ldo_disable, 169 - .get_voltage = lp3971_ldo_get_voltage, 171 + .get_voltage_sel = lp3971_ldo_get_voltage_sel, 170 172 .set_voltage_sel = lp3971_ldo_set_voltage_sel, 171 173 }; 172 174 ··· 199 201 return lp3971_set_bits(lp3971, LP3971_BUCK_VOL_ENABLE_REG, mask, 0); 200 202 } 201 203 202 - static int lp3971_dcdc_get_voltage(struct regulator_dev *dev) 204 + static int lp3971_dcdc_get_voltage_sel(struct regulator_dev *dev) 203 205 { 204 206 struct lp3971 *lp3971 = rdev_get_drvdata(dev); 205 207 int buck = rdev_get_id(dev) - LP3971_DCDC1; 206 208 u16 reg; 207 - int val; 208 209 209 210 reg = lp3971_reg_read(lp3971, LP3971_BUCK_TARGET_VOL1_REG(buck)); 210 211 reg &= BUCK_TARGET_VOL_MASK; 211 212 212 - if (reg <= BUCK_TARGET_VOL_MAX_IDX) 213 - val = buck_voltage_map[reg]; 214 - else { 215 - val = 0; 216 - dev_warn(&dev->dev, "chip reported incorrect voltage value.\n"); 217 - } 218 - 219 - return val; 213 + return reg; 220 214 } 221 215 222 216 static int lp3971_dcdc_set_voltage_sel(struct regulator_dev *dev, ··· 239 249 .is_enabled = lp3971_dcdc_is_enabled, 240 250 .enable = lp3971_dcdc_enable, 241 251 .disable = lp3971_dcdc_disable, 242 - .get_voltage = lp3971_dcdc_get_voltage, 252 + .get_voltage_sel = lp3971_dcdc_get_voltage_sel, 243 253 .set_voltage_sel = lp3971_dcdc_set_voltage_sel, 244 254 }; 245 255