regulator: sy8106a: Get rid of struct sy8106a

All the fields in struct sy8106a are only used in sy8106a_i2c_probe(), so
use local variables instead.

Signed-off-by: Axel Lin <axel.lin@ingics.com>
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/drivers/regulator/sy8106a-regulator.c b/drivers/regulator/sy8106a-regulator.c
index 65fbd1f..42e03b2 100644 (file)
--- a/drivers/regulator/sy8106a-regulator.c
+++ b/drivers/regulator/sy8106a-regulator.c
@@ -22,12 +22,6 @@
  */
 #define SY8106A_GO_BIT                 BIT(7)
 
-struct sy8106a {
-       struct regulator_dev *rdev;
-       struct regmap *regmap;
-       u32 fixed_voltage;
-};
-
 static const struct regmap_config sy8106a_regmap_config = {
        .reg_bits = 8,
        .val_bits = 8,
@@ -70,36 +64,32 @@ static const struct regulator_desc sy8106a_reg = {
 static int sy8106a_i2c_probe(struct i2c_client *i2c,
                            const struct i2c_device_id *id)
 {
-       struct sy8106a *chip;
        struct device *dev = &i2c->dev;
-       struct regulator_dev *rdev = NULL;
+       struct regulator_dev *rdev;
        struct regulator_config config = { };
+       struct regmap *regmap;
        unsigned int reg, vsel;
+       u32 fixed_voltage;
        int error;
 
-       chip = devm_kzalloc(&i2c->dev, sizeof(struct sy8106a), GFP_KERNEL);
-       if (!chip)
-               return -ENOMEM;
-
        error = of_property_read_u32(dev->of_node, "silergy,fixed-microvolt",
-                                    &chip->fixed_voltage);
+                                    &fixed_voltage);
        if (error)
                return error;
 
-       if (chip->fixed_voltage < SY8106A_MIN_MV * 1000 ||
-           chip->fixed_voltage > SY8106A_MAX_MV * 1000)
+       if (fixed_voltage < SY8106A_MIN_MV * 1000 ||
+           fixed_voltage > SY8106A_MAX_MV * 1000)
                return -EINVAL;
 
-       chip->regmap = devm_regmap_init_i2c(i2c, &sy8106a_regmap_config);
-       if (IS_ERR(chip->regmap)) {
-               error = PTR_ERR(chip->regmap);
+       regmap = devm_regmap_init_i2c(i2c, &sy8106a_regmap_config);
+       if (IS_ERR(regmap)) {
+               error = PTR_ERR(regmap);
                dev_err(dev, "Failed to allocate register map: %d\n", error);
                return error;
        }
 
        config.dev = &i2c->dev;
-       config.regmap = chip->regmap;
-       config.driver_data = chip;
+       config.regmap = regmap;
 
        config.of_node = dev->of_node;
        config.init_data = of_get_regulator_init_data(dev, dev->of_node,
@@ -109,15 +99,15 @@ static int sy8106a_i2c_probe(struct i2c_client *i2c,
                return -ENOMEM;
 
        /* Ensure GO_BIT is enabled when probing */
-       error = regmap_read(chip->regmap, SY8106A_REG_VOUT1_SEL, &reg);
+       error = regmap_read(regmap, SY8106A_REG_VOUT1_SEL, &reg);
        if (error)
                return error;
 
        if (!(reg & SY8106A_GO_BIT)) {
-               vsel = (chip->fixed_voltage / 1000 - SY8106A_MIN_MV) /
+               vsel = (fixed_voltage / 1000 - SY8106A_MIN_MV) /
                       SY8106A_STEP_MV;
 
-               error = regmap_write(chip->regmap, SY8106A_REG_VOUT1_SEL,
+               error = regmap_write(regmap, SY8106A_REG_VOUT1_SEL,
                                     vsel | SY8106A_GO_BIT);
                if (error)
                        return error;
@@ -131,10 +121,6 @@ static int sy8106a_i2c_probe(struct i2c_client *i2c,
                return error;
        }
 
-       chip->rdev = rdev;
-
-       i2c_set_clientdata(i2c, chip);
-
        return 0;
 }