]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
[media] s5p-tv: Use devm_regulator_get() in sdo_drv.c file
authorSachin Kamat <sachin.kamat@linaro.org>
Fri, 10 Aug 2012 10:53:45 +0000 (07:53 -0300)
committerMauro Carvalho Chehab <mchehab@redhat.com>
Wed, 15 Aug 2012 22:00:00 +0000 (19:00 -0300)
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>
drivers/media/platform/s5p-tv/sdo_drv.c

index f6bca2c20e8923d1cc6a3b5d1e44d452e8acdf2f..ad68bbed014e2c3a31119c0f4ea46c0317903b5f 100644 (file)
@@ -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 */
@@ -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:
@@ -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);