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

regulator: hi655x: Remove ctrl_mask field from struct hi655x_regulator

The rdev->desc->enable_mask setting is always the same as
BIT(regulator->ctrl_mask), so just use rdev->desc->enable_mask instead.

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
29e5cb65 784816d4

+3 -10
+3 -10
drivers/regulator/hi655x-regulator.c
··· 28 28 struct hi655x_regulator { 29 29 unsigned int disable_reg; 30 30 unsigned int status_reg; 31 - unsigned int ctrl_mask; 32 31 struct regulator_desc rdesc; 33 32 }; 34 33 ··· 76 77 static int hi655x_is_enabled(struct regulator_dev *rdev) 77 78 { 78 79 unsigned int value = 0; 79 - 80 80 struct hi655x_regulator *regulator = rdev_get_drvdata(rdev); 81 81 82 82 regmap_read(rdev->regmap, regulator->status_reg, &value); 83 - return (value & BIT(regulator->ctrl_mask)); 83 + return (value & rdev->desc->enable_mask); 84 84 } 85 85 86 86 static int hi655x_disable(struct regulator_dev *rdev) 87 87 { 88 - int ret = 0; 89 - 90 88 struct hi655x_regulator *regulator = rdev_get_drvdata(rdev); 91 89 92 - ret = regmap_write(rdev->regmap, regulator->disable_reg, 93 - BIT(regulator->ctrl_mask)); 94 - return ret; 90 + return regmap_write(rdev->regmap, regulator->disable_reg, 91 + rdev->desc->enable_mask); 95 92 } 96 93 97 94 static const struct regulator_ops hi655x_regulator_ops = { ··· 127 132 }, \ 128 133 .disable_reg = HI655X_BUS_ADDR(dreg), \ 129 134 .status_reg = HI655X_BUS_ADDR(sreg), \ 130 - .ctrl_mask = cmask, \ 131 135 } 132 136 133 137 #define HI655X_LDO_LINEAR(_ID, vreg, vmask, ereg, dreg, \ ··· 149 155 }, \ 150 156 .disable_reg = HI655X_BUS_ADDR(dreg), \ 151 157 .status_reg = HI655X_BUS_ADDR(sreg), \ 152 - .ctrl_mask = cmask, \ 153 158 } 154 159 155 160 static const struct hi655x_regulator regulators[] = {