regulator: hi655x: Constify regulators array
PATCH 1/2 regulator: hi655x: Constify regulators array
The regulators array should never need to be modified, make it const so compiler can put it to .rodata.
Signed-off-by Axel Lin <[email protected]>
--- drivers/regulator/hi655x-regulator.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/regulator/hi655x-regulator.c +1 -1
@@ -158,7 +158,7 @@ static const struct regulator_ops hi655x_ldo_linear_ops = { .ctrl_mask = cmask, \ } -static struct hi655x_regulator regulators[] = { +static const struct hi655x_regulator regulators[] = {HI655X_LDO_LINEAR (LDO2 ,0x72 ,0x07 ,0x29 ,0x2a ,0x2b ,0x01 ,2500000 ,8 ,100000 ),HI655X_LDO (LDO7 ,0x78 ,0x07 ,0x29 ,0x2a ,0x2b ,0x06 , ldo7_voltages),
Signature · 1 line
2.17.1
PATCH 2/2 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 <[email protected]>
--- drivers/regulator/hi655x-regulator.c | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-)
drivers/regulator/hi655x-regulator.c +3 -10
@@ -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[] = {
Signature · 1 line
2.17.1