regulator: rt6160: Remove vsel_active_low from struct rt6160_priv

Use a local variable instead is enough, this simplifies the code.

Signed-off-by: Axel Lin <axel.lin@ingics.com>
Link: https://lore.kernel.org/r/20210615103947.3387994-1-axel.lin@ingics.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/drivers/regulator/rt6160-regulator.c b/drivers/regulator/rt6160-regulator.c
index b6b5386..ccd023d 100644 (file)
--- a/drivers/regulator/rt6160-regulator.c
+++ b/drivers/regulator/rt6160-regulator.c
@@ -42,7 +42,6 @@ struct rt6160_priv {
        struct regulator_desc desc;
        struct gpio_desc *enable_gpio;
        struct regmap *regmap;
-       bool vsel_active_low;
        bool enable_state;
 };
 
@@ -128,19 +127,15 @@ static unsigned int rt6160_get_mode(struct regulator_dev *rdev)
 
 static int rt6160_set_suspend_voltage(struct regulator_dev *rdev, int uV)
 {
-       struct rt6160_priv *priv = rdev_get_drvdata(rdev);
        struct regmap *regmap = rdev_get_regmap(rdev);
-       unsigned int reg = RT6160_REG_VSELH;
        int vsel;
 
        vsel = regulator_map_voltage_linear(rdev, uV, uV);
        if (vsel < 0)
                return vsel;
 
-       if (priv->vsel_active_low)
-               reg = RT6160_REG_VSELL;
-
-       return regmap_update_bits(regmap, reg, RT6160_VSEL_MASK, vsel);
+       return regmap_update_bits(regmap, rdev->desc->vsel_reg,
+                                 RT6160_VSEL_MASK, vsel);
 }
 
 static int rt6160_get_error_flags(struct regulator_dev *rdev, unsigned int *flags)
@@ -228,6 +223,7 @@ static int rt6160_probe(struct i2c_client *i2c)
        struct rt6160_priv *priv;
        struct regulator_config regulator_cfg = {};
        struct regulator_dev *rdev;
+       bool vsel_active_low;
        unsigned int devid;
        int ret;
 
@@ -235,7 +231,8 @@ static int rt6160_probe(struct i2c_client *i2c)
        if (!priv)
                return -ENOMEM;
 
-       priv->vsel_active_low = device_property_present(&i2c->dev, "richtek,vsel-active-low");
+       vsel_active_low =
+               device_property_present(&i2c->dev, "richtek,vsel-active-low");
 
        priv->enable_gpio = devm_gpiod_get_optional(&i2c->dev, "enable", GPIOD_OUT_HIGH);
        if (IS_ERR(priv->enable_gpio)) {
@@ -267,7 +264,10 @@ static int rt6160_probe(struct i2c_client *i2c)
        priv->desc.owner = THIS_MODULE;
        priv->desc.min_uV = RT6160_VOUT_MINUV;
        priv->desc.uV_step = RT6160_VOUT_STPUV;
-       priv->desc.vsel_reg = RT6160_REG_VSELH;
+       if (vsel_active_low)
+               priv->desc.vsel_reg = RT6160_REG_VSELL;
+       else
+               priv->desc.vsel_reg = RT6160_REG_VSELH;
        priv->desc.vsel_mask = RT6160_VSEL_MASK;
        priv->desc.n_voltages = RT6160_N_VOUTS;
        priv->desc.ramp_reg = RT6160_REG_CNTL;
@@ -276,8 +276,6 @@ static int rt6160_probe(struct i2c_client *i2c)
        priv->desc.n_ramp_values = ARRAY_SIZE(rt6160_ramp_tables);
        priv->desc.of_map_mode = rt6160_of_map_mode;
        priv->desc.ops = &rt6160_regulator_ops;
-       if (priv->vsel_active_low)
-               priv->desc.vsel_reg = RT6160_REG_VSELL;
 
        regulator_cfg.dev = &i2c->dev;
        regulator_cfg.of_node = i2c->dev.of_node;