diff options
author | Krzysztof Kozlowski <k.kozlowski@samsung.com> | 2014-02-28 05:01:48 -0500 |
---|---|---|
committer | Mark Brown <broonie@linaro.org> | 2014-03-02 21:08:54 -0500 |
commit | 3119525203149fc11ce9f48131afdf9795d7a4ea (patch) | |
tree | 6cc13e7b79f8a5f82fbe1de5cc5cd5644af2fb82 | |
parent | b28a960c42fcd9cfc987441fa6d1c1a471f0f9ed (diff) |
regulator: s2mps11: Don't store registered regulators in state container
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.kozlowski@samsung.com>
Signed-off-by: Mark Brown <broonie@linaro.org>
-rw-r--r-- | drivers/regulator/s2mps11.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/regulator/s2mps11.c b/drivers/regulator/s2mps11.c index cd0b9e35a56d..3647d590b962 100644 --- a/drivers/regulator/s2mps11.c +++ b/drivers/regulator/s2mps11.c | |||
@@ -28,8 +28,6 @@ | |||
28 | #define S2MPS11_REGULATOR_CNT ARRAY_SIZE(regulators) | 28 | #define S2MPS11_REGULATOR_CNT ARRAY_SIZE(regulators) |
29 | 29 | ||
30 | struct s2mps11_info { | 30 | struct s2mps11_info { |
31 | struct regulator_dev *rdev[S2MPS11_REGULATOR_MAX]; | ||
32 | |||
33 | int ramp_delay2; | 31 | int ramp_delay2; |
34 | int ramp_delay34; | 32 | int ramp_delay34; |
35 | int ramp_delay5; | 33 | int ramp_delay5; |
@@ -439,6 +437,8 @@ common_reg: | |||
439 | config.regmap = iodev->regmap_pmic; | 437 | config.regmap = iodev->regmap_pmic; |
440 | config.driver_data = s2mps11; | 438 | config.driver_data = s2mps11; |
441 | for (i = 0; i < S2MPS11_REGULATOR_MAX; i++) { | 439 | for (i = 0; i < S2MPS11_REGULATOR_MAX; i++) { |
440 | struct regulator_dev *regulator; | ||
441 | |||
442 | if (!reg_np) { | 442 | if (!reg_np) { |
443 | config.init_data = pdata->regulators[i].initdata; | 443 | config.init_data = pdata->regulators[i].initdata; |
444 | config.of_node = pdata->regulators[i].reg_node; | 444 | config.of_node = pdata->regulators[i].reg_node; |
@@ -447,10 +447,10 @@ common_reg: | |||
447 | config.of_node = rdata[i].of_node; | 447 | config.of_node = rdata[i].of_node; |
448 | } | 448 | } |
449 | 449 | ||
450 | s2mps11->rdev[i] = devm_regulator_register(&pdev->dev, | 450 | regulator = devm_regulator_register(&pdev->dev, |
451 | ®ulators[i], &config); | 451 | ®ulators[i], &config); |
452 | if (IS_ERR(s2mps11->rdev[i])) { | 452 | if (IS_ERR(regulator)) { |
453 | ret = PTR_ERR(s2mps11->rdev[i]); | 453 | ret = PTR_ERR(regulator); |
454 | dev_err(&pdev->dev, "regulator init failed for %d\n", | 454 | dev_err(&pdev->dev, "regulator init failed for %d\n", |
455 | i); | 455 | i); |
456 | return ret; | 456 | return ret; |