FEX-Emu/linux
1
0
Fork 0
mirror of https://github.com/FEX-Emu/linux.git synced 2025-01-05 08:48:53 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

regulator: qcom: Tidy up probe()

Browse Source 
Tidy up error reporting and move rpm reference retrieval out of the for
loop for improved readability.

Signed-off-by: Bjorn Andersson <bjorn.andersson@sonymobile.com>
Reviewed-by: Stephen Boyd <sboyd@codeaurora.org>
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Bjorn Andersson 2015-04-06 16:34:00 -07:00 committed by Mark Brown
parent 087a1b5cdd
commit ce8ae17c5d
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
drivers/regulator/qcom_rpm-regulator.c
View File

@ -884,19 +884,26 @@ static int rpm_reg_probe(struct platform_device *pdev)
struct regulator_config config = { }; struct regulator_config config = { };
struct regulator_dev *rdev; struct regulator_dev *rdev;
struct qcom_rpm_reg *vreg; struct qcom_rpm_reg *vreg;
struct qcom_rpm *rpm;
rpm = dev_get_drvdata(pdev->dev.parent);
if (!rpm) {
dev_err(&pdev->dev, "unable to retrieve handle to rpm\n");
return -ENODEV;
}
match = of_match_device(rpm_of_match, &pdev->dev); match = of_match_device(rpm_of_match, &pdev->dev);
for (reg = match->data; reg->name; reg++) { for (reg = match->data; reg->name; reg++) {
vreg = devm_kmalloc(&pdev->dev, sizeof(*vreg), GFP_KERNEL); vreg = devm_kmalloc(&pdev->dev, sizeof(*vreg), GFP_KERNEL);
if (!vreg) { if (!vreg)
dev_err(&pdev->dev, "failed to allocate vreg\n");
return -ENOMEM; return -ENOMEM;
}
memcpy(vreg, reg->template, sizeof(*vreg)); memcpy(vreg, reg->template, sizeof(*vreg));
mutex_init(&vreg->lock); mutex_init(&vreg->lock);
vreg->dev = &pdev->dev; vreg->dev = &pdev->dev;
vreg->resource = reg->resource; vreg->resource = reg->resource;
vreg->rpm = rpm;
vreg->desc.id = -1; vreg->desc.id = -1;
vreg->desc.owner = THIS_MODULE; vreg->desc.owner = THIS_MODULE;
@ -906,17 +913,11 @@ static int rpm_reg_probe(struct platform_device *pdev)
vreg->desc.of_match = reg->name; vreg->desc.of_match = reg->name;
vreg->desc.of_parse_cb = rpm_reg_of_parse; vreg->desc.of_parse_cb = rpm_reg_of_parse;
vreg->rpm = dev_get_drvdata(pdev->dev.parent);
if (!vreg->rpm) {
dev_err(&pdev->dev, "unable to retrieve handle to rpm\n");
return -ENODEV;
}
config.dev = &pdev->dev; config.dev = &pdev->dev;
config.driver_data = vreg; config.driver_data = vreg;
rdev = devm_regulator_register(&pdev->dev, &vreg->desc, &config); rdev = devm_regulator_register(&pdev->dev, &vreg->desc, &config);
if (IS_ERR(rdev)) { if (IS_ERR(rdev)) {
dev_err(&pdev->dev, "can't register regulator\n"); dev_err(&pdev->dev, "failed to register %s\n", reg->name);
return PTR_ERR(rdev); return PTR_ERR(rdev);
} }
} }