]> git.openfabrics.org - ~shefty/rdma-dev.git/commitdiff
mmc: sdhci-dove: use devm_clk_get()
authorRussell King <rmk+kernel@arm.linux.org.uk>
Thu, 22 Nov 2012 23:55:10 +0000 (23:55 +0000)
committerChris Ball <cjb@laptop.org>
Thu, 6 Dec 2012 18:55:13 +0000 (13:55 -0500)
Use devm_clk_get() rather than clk_get() to make cleanup paths more simple.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Signed-off-by: Chris Ball <cjb@laptop.org>
drivers/mmc/host/sdhci-dove.c

index 8fd50a211037126df4a4beea26dd6fc3aaa71c94..4233fd98e3aabfeb6ce2ca2fb1b6f58e2cba2528 100644 (file)
@@ -92,7 +92,7 @@ static int __devinit sdhci_dove_probe(struct platform_device *pdev)
                return -ENOMEM;
        }
 
                return -ENOMEM;
        }
 
-       priv->clk = clk_get(&pdev->dev, NULL);
+       priv->clk = devm_clk_get(&pdev->dev, NULL);
        if (!IS_ERR(priv->clk))
                clk_prepare_enable(priv->clk);
 
        if (!IS_ERR(priv->clk))
                clk_prepare_enable(priv->clk);
 
@@ -107,10 +107,8 @@ static int __devinit sdhci_dove_probe(struct platform_device *pdev)
        return 0;
 
 sdhci_dove_register_fail:
        return 0;
 
 sdhci_dove_register_fail:
-       if (!IS_ERR(priv->clk)) {
+       if (!IS_ERR(priv->clk))
                clk_disable_unprepare(priv->clk);
                clk_disable_unprepare(priv->clk);
-               clk_put(priv->clk);
-       }
        return ret;
 }
 
        return ret;
 }
 
@@ -122,10 +120,9 @@ static int __devexit sdhci_dove_remove(struct platform_device *pdev)
 
        sdhci_pltfm_unregister(pdev);
 
 
        sdhci_pltfm_unregister(pdev);
 
-       if (!IS_ERR(priv->clk)) {
+       if (!IS_ERR(priv->clk))
                clk_disable_unprepare(priv->clk);
                clk_disable_unprepare(priv->clk);
-               clk_put(priv->clk);
-       }
+
        return 0;
 }
 
        return 0;
 }