msm: pil-riva: Migrate to devm_clk_get()
Clean up some error paths and simplify the code by moving to
devm_clk_get().
Change-Id: Ia172fbbe9af83020023fd61164b9d6c7efec7fb5
Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
diff --git a/arch/arm/mach-msm/pil-riva.c b/arch/arm/mach-msm/pil-riva.c
index ecbbcb9..8a16b43 100644
--- a/arch/arm/mach-msm/pil-riva.c
+++ b/arch/arm/mach-msm/pil-riva.c
@@ -318,14 +318,14 @@
if (ret) {
dev_err(&pdev->dev,
"failed to set pll supply voltage\n");
- goto err;
+ return ret;
}
ret = regulator_set_optimum_mode(drv->pll_supply, 100000);
if (ret < 0) {
dev_err(&pdev->dev,
"failed to set pll supply optimum mode\n");
- goto err;
+ return ret;
}
}
@@ -342,29 +342,20 @@
dev_info(&pdev->dev, "using non-secure boot\n");
}
- drv->xo = clk_get(&pdev->dev, "cxo");
- if (IS_ERR(drv->xo)) {
- ret = PTR_ERR(drv->xo);
- goto err;
- }
+ drv->xo = devm_clk_get(&pdev->dev, "cxo");
+ if (IS_ERR(drv->xo))
+ return PTR_ERR(drv->xo);
drv->pil = msm_pil_register(desc);
- if (IS_ERR(drv->pil)) {
- ret = PTR_ERR(drv->pil);
- goto err_register;
- }
+ if (IS_ERR(drv->pil))
+ return PTR_ERR(drv->pil);
return 0;
-err_register:
- clk_put(drv->xo);
-err:
- return ret;
}
static int __devexit pil_riva_remove(struct platform_device *pdev)
{
struct riva_data *drv = platform_get_drvdata(pdev);
msm_pil_unregister(drv->pil);
- clk_put(drv->xo);
return 0;
}