diff options
| author |  Axel Lin <axel.lin@ingics.com>
| 2019-04-08 20:09:33 +0800 |
|---|---|---|
| committer |  Mark Brown <broonie@kernel.org>
| 2019-04-10 12:22:32 +0100 |
| commit | 29e5cb657e2acdf902b0122ca58620ccd771f297 (patch) | |
| tree | 7a956fc3e65a1b136747f7bd7e75b899730d1eeb /drivers/regulator/hi655x-regulator.c | |
| parent | regulator: hi655x: Constify regulators array (diff) | |
| download | linux-29e5cb657e2acdf902b0122ca58620ccd771f297.tar.gz linux-29e5cb657e2acdf902b0122ca58620ccd771f297.tar.bz2 linux-29e5cb657e2acdf902b0122ca58620ccd771f297.zip | |
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>
Diffstat (limited to 'drivers/regulator/hi655x-regulator.c')
| -rw-r--r-- | drivers/regulator/hi655x-regulator.c | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/drivers/regulator/hi655x-regulator.c b/drivers/regulator/hi655x-regulator.c index 460ae70d8b04..6f6635daa026 100644 --- a/drivers/regulator/hi655x-regulator.c +++ b/drivers/regulator/hi655x-regulator.c @@ -28,7 +28,6 @@ struct hi655x_regulator { unsigned int disable_reg; unsigned int status_reg; - unsigned int ctrl_mask; struct regulator_desc rdesc; }; @@ -77,22 +76,18 @@ enum hi655x_regulator_id { static int hi655x_is_enabled(struct regulator_dev *rdev) { unsigned int value = 0; - struct hi655x_regulator *regulator = rdev_get_drvdata(rdev); regmap_read(rdev->regmap, regulator->status_reg, &value); - return (value & BIT(regulator->ctrl_mask)); + return (value & rdev->desc->enable_mask); } static int hi655x_disable(struct regulator_dev *rdev) { - int ret = 0; - struct hi655x_regulator *regulator = rdev_get_drvdata(rdev); - ret = regmap_write(rdev->regmap, regulator->disable_reg, - BIT(regulator->ctrl_mask)); - return ret; + return regmap_write(rdev->regmap, regulator->disable_reg, + rdev->desc->enable_mask); } static const struct regulator_ops hi655x_regulator_ops = { @@ -132,7 +127,6 @@ static const struct regulator_ops hi655x_ldo_linear_ops = { }, \ .disable_reg = HI655X_BUS_ADDR(dreg), \ .status_reg = HI655X_BUS_ADDR(sreg), \ - .ctrl_mask = cmask, \ } #define HI655X_LDO_LINEAR(_ID, vreg, vmask, ereg, dreg, \ @@ -155,7 +149,6 @@ static const struct regulator_ops hi655x_ldo_linear_ops = { }, \ .disable_reg = HI655X_BUS_ADDR(dreg), \ .status_reg = HI655X_BUS_ADDR(sreg), \ - .ctrl_mask = cmask, \ } static const struct hi655x_regulator regulators[] = { |