]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
regulator: isl6271a: Remove *rdev[3] from struct isl_pmic
authorAxel Lin <axel.lin@ingics.com>
Mon, 28 Jan 2019 14:19:20 +0000 (22:19 +0800)
committerMark Brown <broonie@kernel.org>
Mon, 28 Jan 2019 15:29:03 +0000 (15:29 +0000)
This driver is using devm_regulator_register, so it's not necessary to
store *rdev[3] in struct isl_pmic. Use a local variable instead.

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

index 4abd8e9c81e5893b4a84d3146db7131c8f42387a..ae29c87730578e0f8b773334748223eb94f96f46 100644 (file)
@@ -31,7 +31,6 @@
 /* PMIC details */
 struct isl_pmic {
        struct i2c_client       *client;
-       struct regulator_dev    *rdev[3];
        struct mutex            mtx;
 };
 
@@ -109,6 +108,7 @@ static const struct regulator_desc isl_rd[] = {
 static int isl6271a_probe(struct i2c_client *i2c,
                                     const struct i2c_device_id *id)
 {
+       struct regulator_dev *rdev;
        struct regulator_config config = { };
        struct regulator_init_data *init_data   = dev_get_platdata(&i2c->dev);
        struct isl_pmic *pmic;
@@ -133,11 +133,10 @@ static int isl6271a_probe(struct i2c_client *i2c,
                        config.init_data = NULL;
                config.driver_data = pmic;
 
-               pmic->rdev[i] = devm_regulator_register(&i2c->dev, &isl_rd[i],
-                                                       &config);
-               if (IS_ERR(pmic->rdev[i])) {
+               rdev = devm_regulator_register(&i2c->dev, &isl_rd[i], &config);
+               if (IS_ERR(rdev)) {
                        dev_err(&i2c->dev, "failed to register %s\n", id->name);
-                       return PTR_ERR(pmic->rdev[i]);
+                       return PTR_ERR(rdev);
                }
        }