]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
staging: iio: replace clk_get() with devm_clk_get()
authorGujulan Elango, Hari Prasath (H.) <hgujulan@visteon.com>
Tue, 2 Feb 2016 12:56:32 +0000 (12:56 +0000)
committerJonathan Cameron <jic23@kernel.org>
Sat, 6 Feb 2016 18:42:54 +0000 (18:42 +0000)
This patch replaces the clk_get() with devm_clk_get().Accordingly,modified
the error paths,rename error labels and removed clk_put() in probe() &
remove functions.

Signed-off-by: Hari Prasath Gujulan Elango <hgujulan@visteon.com>
Signed-off-by: Jonathan Cameron <jic23@kernel.org>
drivers/staging/iio/adc/spear_adc.c

index 712cae0e86086a6bef1b430f0099a65f516e332c..f2c006572783b89a2a4fdabf76a3dd54735351cb 100644 (file)
@@ -288,7 +288,7 @@ static int spear_adc_probe(struct platform_device *pdev)
        st->adc_base_spear3xx =
                (struct adc_regs_spear3xx __iomem *)st->adc_base_spear6xx;
 
-       st->clk = clk_get(dev, NULL);
+       st->clk = devm_clk_get(dev, NULL);
        if (IS_ERR(st->clk)) {
                dev_err(dev, "failed getting clock\n");
                goto errout1;
@@ -297,28 +297,28 @@ static int spear_adc_probe(struct platform_device *pdev)
        ret = clk_prepare_enable(st->clk);
        if (ret) {
                dev_err(dev, "failed enabling clock\n");
-               goto errout2;
+               goto errout1;
        }
 
        irq = platform_get_irq(pdev, 0);
        if (irq <= 0) {
                dev_err(dev, "failed getting interrupt resource\n");
                ret = -EINVAL;
-               goto errout3;
+               goto errout2;
        }
 
        ret = devm_request_irq(dev, irq, spear_adc_isr, 0, SPEAR_ADC_MOD_NAME,
                               st);
        if (ret < 0) {
                dev_err(dev, "failed requesting interrupt\n");
-               goto errout3;
+               goto errout2;
        }
 
        if (of_property_read_u32(np, "sampling-frequency",
                                 &st->sampling_freq)) {
                dev_err(dev, "sampling-frequency missing in DT\n");
                ret = -EINVAL;
-               goto errout3;
+               goto errout2;
        }
 
        /*
@@ -348,16 +348,14 @@ static int spear_adc_probe(struct platform_device *pdev)
 
        ret = iio_device_register(indio_dev);
        if (ret)
-               goto errout3;
+               goto errout2;
 
        dev_info(dev, "SPEAR ADC driver loaded, IRQ %d\n", irq);
 
        return 0;
 
-errout3:
-       clk_disable_unprepare(st->clk);
 errout2:
-       clk_put(st->clk);
+       clk_disable_unprepare(st->clk);
 errout1:
        iounmap(st->adc_base_spear6xx);
        return ret;
@@ -370,7 +368,6 @@ static int spear_adc_remove(struct platform_device *pdev)
 
        iio_device_unregister(indio_dev);
        clk_disable_unprepare(st->clk);
-       clk_put(st->clk);
        iounmap(st->adc_base_spear6xx);
 
        return 0;