aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media
diff options
context:
space:
mode:
authorSachin Kamat <sachin.kamat@linaro.org>2012-08-10 06:53:45 -0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2012-08-15 18:00:00 -0400
commit00d98c1bd6fe93de6db6a99ed25b4b7d96a402ec (patch)
tree2e9c4b4321905a2346f817ba22e0cb8f121ad7fd /drivers/media
parentd1bb4b29a74ea81b8282011479bc36417620b5fa (diff)
[media] s5p-tv: Use devm_regulator_get() in sdo_drv.c file
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>
Diffstat (limited to 'drivers/media')
-rw-r--r--drivers/media/platform/s5p-tv/sdo_drv.c10
1 files changed, 3 insertions, 7 deletions
diff --git a/drivers/media/platform/s5p-tv/sdo_drv.c b/drivers/media/platform/s5p-tv/sdo_drv.c
index f6bca2c20e89..ad68bbed014e 100644
--- a/drivers/media/platform/s5p-tv/sdo_drv.c
+++ b/drivers/media/platform/s5p-tv/sdo_drv.c
@@ -374,15 +374,15 @@ static int __devinit sdo_probe(struct platform_device *pdev)
374 dev_info(dev, "fout_vpll.rate = %lu\n", clk_get_rate(sclk_vpll)); 374 dev_info(dev, "fout_vpll.rate = %lu\n", clk_get_rate(sclk_vpll));
375 375
376 /* acquire regulator */ 376 /* acquire regulator */
377 sdev->vdac = regulator_get(dev, "vdd33a_dac"); 377 sdev->vdac = devm_regulator_get(dev, "vdd33a_dac");
378 if (IS_ERR_OR_NULL(sdev->vdac)) { 378 if (IS_ERR_OR_NULL(sdev->vdac)) {
379 dev_err(dev, "failed to get regulator 'vdac'\n"); 379 dev_err(dev, "failed to get regulator 'vdac'\n");
380 goto fail_fout_vpll; 380 goto fail_fout_vpll;
381 } 381 }
382 sdev->vdet = regulator_get(dev, "vdet"); 382 sdev->vdet = devm_regulator_get(dev, "vdet");
383 if (IS_ERR_OR_NULL(sdev->vdet)) { 383 if (IS_ERR_OR_NULL(sdev->vdet)) {
384 dev_err(dev, "failed to get regulator 'vdet'\n"); 384 dev_err(dev, "failed to get regulator 'vdet'\n");
385 goto fail_vdac; 385 goto fail_fout_vpll;
386 } 386 }
387 387
388 /* enable gate for dac clock, because mixer uses it */ 388 /* enable gate for dac clock, because mixer uses it */
@@ -406,8 +406,6 @@ static int __devinit sdo_probe(struct platform_device *pdev)
406 dev_info(dev, "probe succeeded\n"); 406 dev_info(dev, "probe succeeded\n");
407 return 0; 407 return 0;
408 408
409fail_vdac:
410 regulator_put(sdev->vdac);
411fail_fout_vpll: 409fail_fout_vpll:
412 clk_put(sdev->fout_vpll); 410 clk_put(sdev->fout_vpll);
413fail_dacphy: 411fail_dacphy:
@@ -428,8 +426,6 @@ static int __devexit sdo_remove(struct platform_device *pdev)
428 426
429 pm_runtime_disable(&pdev->dev); 427 pm_runtime_disable(&pdev->dev);
430 clk_disable(sdev->dac); 428 clk_disable(sdev->dac);
431 regulator_put(sdev->vdet);
432 regulator_put(sdev->vdac);
433 clk_put(sdev->fout_vpll); 429 clk_put(sdev->fout_vpll);
434 clk_put(sdev->dacphy); 430 clk_put(sdev->dacphy);
435 clk_put(sdev->dac); 431 clk_put(sdev->dac);