Skip to content

Commit

Permalink
[media] s5p-tv: Use devm_regulator_get() in sdo_drv.c file
Browse files Browse the repository at this point in the history
devm_regulator_get() is a device managed function and makes the exit code
a bit simpler and cleaner.

Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
  • Loading branch information
Sachin Kamat authored and Mauro Carvalho Chehab committed Aug 15, 2012
1 parent d1bb4b2 commit 00d98c1
Showing 1 changed file with 3 additions and 7 deletions.
10 changes: 3 additions & 7 deletions drivers/media/platform/s5p-tv/sdo_drv.c
Original file line number Diff line number Diff line change
Expand Up @@ -374,15 +374,15 @@ static int __devinit sdo_probe(struct platform_device *pdev)
dev_info(dev, "fout_vpll.rate = %lu\n", clk_get_rate(sclk_vpll));

/* acquire regulator */
sdev->vdac = regulator_get(dev, "vdd33a_dac");
sdev->vdac = devm_regulator_get(dev, "vdd33a_dac");
if (IS_ERR_OR_NULL(sdev->vdac)) {
dev_err(dev, "failed to get regulator 'vdac'\n");
goto fail_fout_vpll;
}
sdev->vdet = regulator_get(dev, "vdet");
sdev->vdet = devm_regulator_get(dev, "vdet");
if (IS_ERR_OR_NULL(sdev->vdet)) {
dev_err(dev, "failed to get regulator 'vdet'\n");
goto fail_vdac;
goto fail_fout_vpll;
}

/* enable gate for dac clock, because mixer uses it */
Expand All @@ -406,8 +406,6 @@ static int __devinit sdo_probe(struct platform_device *pdev)
dev_info(dev, "probe succeeded\n");
return 0;

fail_vdac:
regulator_put(sdev->vdac);
fail_fout_vpll:
clk_put(sdev->fout_vpll);
fail_dacphy:
Expand All @@ -428,8 +426,6 @@ static int __devexit sdo_remove(struct platform_device *pdev)

pm_runtime_disable(&pdev->dev);
clk_disable(sdev->dac);
regulator_put(sdev->vdet);
regulator_put(sdev->vdac);
clk_put(sdev->fout_vpll);
clk_put(sdev->dacphy);
clk_put(sdev->dac);
Expand Down

0 comments on commit 00d98c1

Please sign in to comment.