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

regulator: 88pm8607: Use enable_is_inverted flag with regulator_enable_regmap and friends APIs

Signed-off-by: Axel Lin <axel.lin@ingics.com>
Reviewed-by: Haojian Zhuang <haojian.zhuang@gmail.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

authored by

Axel Lin and committed by
Mark Brown
318c658b 51dcdafc

+4 -32
+4 -32
drivers/regulator/88pm8607.c
··· 220 220 return ret; 221 221 } 222 222 223 - static int pm8606_preg_enable(struct regulator_dev *rdev) 224 - { 225 - struct pm8607_regulator_info *info = rdev_get_drvdata(rdev); 226 - 227 - return pm860x_set_bits(info->i2c, rdev->desc->enable_reg, 228 - 1 << rdev->desc->enable_mask, 0); 229 - } 230 - 231 - static int pm8606_preg_disable(struct regulator_dev *rdev) 232 - { 233 - struct pm8607_regulator_info *info = rdev_get_drvdata(rdev); 234 - 235 - return pm860x_set_bits(info->i2c, rdev->desc->enable_reg, 236 - 1 << rdev->desc->enable_mask, 237 - 1 << rdev->desc->enable_mask); 238 - } 239 - 240 - static int pm8606_preg_is_enabled(struct regulator_dev *rdev) 241 - { 242 - struct pm8607_regulator_info *info = rdev_get_drvdata(rdev); 243 - int ret; 244 - 245 - ret = pm860x_reg_read(info->i2c, rdev->desc->enable_reg); 246 - if (ret < 0) 247 - return ret; 248 - 249 - return !((unsigned char)ret & (1 << rdev->desc->enable_mask)); 250 - } 251 - 252 223 static struct regulator_ops pm8607_regulator_ops = { 253 224 .list_voltage = pm8607_list_voltage, 254 225 .set_voltage_sel = regulator_set_voltage_sel_regmap, ··· 230 259 }; 231 260 232 261 static struct regulator_ops pm8606_preg_ops = { 233 - .enable = pm8606_preg_enable, 234 - .disable = pm8606_preg_disable, 235 - .is_enabled = pm8606_preg_is_enabled, 262 + .enable = regulator_enable_regmap, 263 + .disable = regulator_disable_regmap, 264 + .is_enabled = regulator_is_enabled_regmap, 236 265 }; 237 266 238 267 #define PM8606_PREG(ereg, ebit) \ ··· 245 274 .owner = THIS_MODULE, \ 246 275 .enable_reg = PM8606_##ereg, \ 247 276 .enable_mask = (ebit), \ 277 + .enable_is_inverted = true, \ 248 278 }, \ 249 279 } 250 280