diff options
| author | Krzysztof Kozlowski <k.kozlowski@samsung.com> | 2014-03-10 04:32:45 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-03-10 05:29:01 -0400 |
| commit | b0c13e8030fed5bf5ab7b5dd798bfe4da3bd7cca (patch) | |
| tree | 9f50a4a66d45efd417b1e813f6e19b9e71e18577 | |
| parent | 7c2ee82c1620945b6d919c99e40230eef62da919 (diff) | |
regulator: max77686: Remove regulator_dev array from state container
Don't store array of regulator_dev returned by devm_regulator_register()
in state container. It isn't used anywhere outside of
max77686_pmic_probe() function.
Signed-off-by: Krzysztof Kozlowski <k.kozlowski@samsung.com>
Signed-off-by: Mark Brown <broonie@linaro.org>
| -rw-r--r-- | drivers/regulator/max77686.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/regulator/max77686.c b/drivers/regulator/max77686.c index de020adf0568..ef1af2debbd2 100644 --- a/drivers/regulator/max77686.c +++ b/drivers/regulator/max77686.c | |||
| @@ -65,7 +65,6 @@ enum max77686_ramp_rate { | |||
| 65 | }; | 65 | }; |
| 66 | 66 | ||
| 67 | struct max77686_data { | 67 | struct max77686_data { |
| 68 | struct regulator_dev *rdev[MAX77686_REGULATORS]; | ||
| 69 | unsigned int opmode[MAX77686_REGULATORS]; | 68 | unsigned int opmode[MAX77686_REGULATORS]; |
| 70 | }; | 69 | }; |
| 71 | 70 | ||
| @@ -474,16 +473,18 @@ static int max77686_pmic_probe(struct platform_device *pdev) | |||
| 474 | platform_set_drvdata(pdev, max77686); | 473 | platform_set_drvdata(pdev, max77686); |
| 475 | 474 | ||
| 476 | for (i = 0; i < MAX77686_REGULATORS; i++) { | 475 | for (i = 0; i < MAX77686_REGULATORS; i++) { |
| 476 | struct regulator_dev *rdev; | ||
| 477 | |||
| 477 | config.init_data = pdata->regulators[i].initdata; | 478 | config.init_data = pdata->regulators[i].initdata; |
| 478 | config.of_node = pdata->regulators[i].of_node; | 479 | config.of_node = pdata->regulators[i].of_node; |
| 479 | 480 | ||
| 480 | max77686->opmode[i] = regulators[i].enable_mask; | 481 | max77686->opmode[i] = regulators[i].enable_mask; |
| 481 | max77686->rdev[i] = devm_regulator_register(&pdev->dev, | 482 | rdev = devm_regulator_register(&pdev->dev, |
| 482 | ®ulators[i], &config); | 483 | ®ulators[i], &config); |
| 483 | if (IS_ERR(max77686->rdev[i])) { | 484 | if (IS_ERR(rdev)) { |
| 484 | dev_err(&pdev->dev, | 485 | dev_err(&pdev->dev, |
| 485 | "regulator init failed for %d\n", i); | 486 | "regulator init failed for %d\n", i); |
| 486 | return PTR_ERR(max77686->rdev[i]); | 487 | return PTR_ERR(rdev); |
| 487 | } | 488 | } |
| 488 | } | 489 | } |
| 489 | 490 | ||
