[PATCH v3 06/13] regulator: s2mps11: Don't store registered regulators in state container

[Krzysztof Kozlowski]

Regulators registered by devm_regulator_register() do not have to be
stored in state container because they are never dereferenced later.
The array of regulator_dev can be safely removed from state container.

Signed-off-by: Krzysztof Kozlowski <k.kozlow...@samsung.com>
---
 drivers/regulator/s2mps11.c |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/drivers/regulator/s2mps11.c b/drivers/regulator/s2mps11.c
index 89966213315c..acdd3b92b8d6 100644
--- a/drivers/regulator/s2mps11.c
+++ b/drivers/regulator/s2mps11.c
@@ -28,8 +28,6 @@
 #define S2MPS11_REGULATOR_CNT ARRAY_SIZE(regulators)
 
 struct s2mps11_info {
-       struct regulator_dev *rdev[S2MPS11_REGULATOR_MAX];
-
        int ramp_delay2;
        int ramp_delay34;
        int ramp_delay5;
@@ -439,6 +437,8 @@ common_reg:
        config.regmap = iodev->regmap_pmic;
        config.driver_data = s2mps11;
        for (i = 0; i < S2MPS11_REGULATOR_MAX; i++) {
+               struct regulator_dev *regulator;
+
                if (!reg_np) {
                        config.init_data = pdata->regulators[i].initdata;
                        config.of_node = pdata->regulators[i].reg_node;
@@ -447,10 +447,10 @@ common_reg:
                        config.of_node = rdata[i].of_node;
                }
 
-               s2mps11->rdev[i] = devm_regulator_register(&pdev->dev,
+               regulator = devm_regulator_register(&pdev->dev,
                                                &regulators[i], &config);
-               if (IS_ERR(s2mps11->rdev[i])) {
-                       ret = PTR_ERR(s2mps11->rdev[i]);
+               if (IS_ERR(regulator)) {
+                       ret = PTR_ERR(regulator);
                        dev_err(&pdev->dev, "regulator init failed for %d\n",
                                i);
                        return ret;
-- 
1.7.9.5

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/