summaryrefslogtreecommitdiffstats
path: root/drivers/regulator/max77686.c
diff options
context:
space:
mode:
authorKrzysztof Kozlowski2014-03-10 09:32:45 +0100
committerMark Brown2014-03-10 10:29:01 +0100
commitb0c13e8030fed5bf5ab7b5dd798bfe4da3bd7cca (patch)
tree9f50a4a66d45efd417b1e813f6e19b9e71e18577 /drivers/regulator/max77686.c
parentregulator: max77686: Remove redundant error message (diff)
downloadkernel-qcow2-linux-b0c13e8030fed5bf5ab7b5dd798bfe4da3bd7cca.tar.gz
kernel-qcow2-linux-b0c13e8030fed5bf5ab7b5dd798bfe4da3bd7cca.tar.xz
kernel-qcow2-linux-b0c13e8030fed5bf5ab7b5dd798bfe4da3bd7cca.zip
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>
Diffstat (limited to 'drivers/regulator/max77686.c')
-rw-r--r--drivers/regulator/max77686.c9
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 {
};
struct max77686_data {
- struct regulator_dev *rdev[MAX77686_REGULATORS];
unsigned int opmode[MAX77686_REGULATORS];
};
@@ -474,16 +473,18 @@ static int max77686_pmic_probe(struct platform_device *pdev)
platform_set_drvdata(pdev, max77686);
for (i = 0; i < MAX77686_REGULATORS; i++) {
+ struct regulator_dev *rdev;
+
config.init_data = pdata->regulators[i].initdata;
config.of_node = pdata->regulators[i].of_node;
max77686->opmode[i] = regulators[i].enable_mask;
- max77686->rdev[i] = devm_regulator_register(&pdev->dev,
+ rdev = devm_regulator_register(&pdev->dev,
&regulators[i], &config);
- if (IS_ERR(max77686->rdev[i])) {
+ if (IS_ERR(rdev)) {
dev_err(&pdev->dev,
"regulator init failed for %d\n", i);
- return PTR_ERR(max77686->rdev[i]);
+ return PTR_ERR(rdev);
}
}