Current code uses devm_regulator_register(), so *rdev[PALMAS_NUM_REGS] is
no longer required.

Signed-off-by: Axel Lin <axel....@ingics.com>
---
 drivers/regulator/palmas-regulator.c | 12 ------------
 include/linux/mfd/palmas.h           |  1 -
 2 files changed, 13 deletions(-)

diff --git a/drivers/regulator/palmas-regulator.c 
b/drivers/regulator/palmas-regulator.c
index f11d41d..197a4cc 100644
--- a/drivers/regulator/palmas-regulator.c
+++ b/drivers/regulator/palmas-regulator.c
@@ -980,9 +980,6 @@ static int palmas_ldo_registration(struct palmas_pmic *pmic,
                        return PTR_ERR(rdev);
                }
 
-               /* Save regulator for cleanup */
-               pmic->rdev[id] = rdev;
-
                /* Initialise sleep/init values from platform data */
                if (pdata) {
                        reg_init = pdata->reg_init[id];
@@ -1090,9 +1087,6 @@ static int tps65917_ldo_registration(struct palmas_pmic 
*pmic,
                        return PTR_ERR(rdev);
                }
 
-               /* Save regulator for cleanup */
-               pmic->rdev[id] = rdev;
-
                /* Initialise sleep/init values from platform data */
                if (pdata) {
                        reg_init = pdata->reg_init[id];
@@ -1277,9 +1271,6 @@ static int palmas_smps_registration(struct palmas_pmic 
*pmic,
                                pdev_name);
                        return PTR_ERR(rdev);
                }
-
-               /* Save regulator for cleanup */
-               pmic->rdev[id] = rdev;
        }
 
        return 0;
@@ -1383,9 +1374,6 @@ static int tps65917_smps_registration(struct palmas_pmic 
*pmic,
                                pdev_name);
                        return PTR_ERR(rdev);
                }
-
-               /* Save regulator for cleanup */
-               pmic->rdev[id] = rdev;
        }
 
        return 0;
diff --git a/include/linux/mfd/palmas.h b/include/linux/mfd/palmas.h
index 5c9a1d4..aee7903 100644
--- a/include/linux/mfd/palmas.h
+++ b/include/linux/mfd/palmas.h
@@ -551,7 +551,6 @@ struct palmas_pmic {
        struct palmas *palmas;
        struct device *dev;
        struct regulator_desc desc[PALMAS_NUM_REGS];
-       struct regulator_dev *rdev[PALMAS_NUM_REGS];
        struct mutex mutex;
 
        int smps123;
-- 
2.5.0

Reply via email to