]> git.proxmox.com Git - mirror_ubuntu-zesty-kernel.git/commitdiff
hwrng: pixocell - Use devm_clk_get()
authorJingoo Han <jg1.han@samsung.com>
Thu, 27 Feb 2014 05:04:28 +0000 (14:04 +0900)
committerHerbert Xu <herbert@gondor.apana.org.au>
Mon, 10 Mar 2014 12:13:37 +0000 (20:13 +0800)
Use devm_clk_get() to make cleanup paths simpler.

Signed-off-by: Jingoo Han <jg1.han@samsung.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
drivers/char/hw_random/picoxcell-rng.c

index c03beeeb1aea0ed832415d491fdf7dff53c5dbac..eab5448ad56fb1313461073c153659e5fae26068 100644 (file)
@@ -108,7 +108,7 @@ static int picoxcell_trng_probe(struct platform_device *pdev)
        if (IS_ERR(rng_base))
                return PTR_ERR(rng_base);
 
-       rng_clk = clk_get(&pdev->dev, NULL);
+       rng_clk = devm_clk_get(&pdev->dev, NULL);
        if (IS_ERR(rng_clk)) {
                dev_warn(&pdev->dev, "no clk\n");
                return PTR_ERR(rng_clk);
@@ -117,7 +117,7 @@ static int picoxcell_trng_probe(struct platform_device *pdev)
        ret = clk_enable(rng_clk);
        if (ret) {
                dev_warn(&pdev->dev, "unable to enable clk\n");
-               goto err_enable;
+               return ret;
        }
 
        picoxcell_trng_start();
@@ -132,9 +132,6 @@ static int picoxcell_trng_probe(struct platform_device *pdev)
 
 err_register:
        clk_disable(rng_clk);
-err_enable:
-       clk_put(rng_clk);
-
        return ret;
 }
 
@@ -142,7 +139,6 @@ static int picoxcell_trng_remove(struct platform_device *pdev)
 {
        hwrng_unregister(&picoxcell_trng);
        clk_disable(rng_clk);
-       clk_put(rng_clk);
 
        return 0;
 }