mmc: sdhci-spear: fix error handling paths for DT

Fix the error handling paths for DT and simplify using the devm_* API
for clk_get().

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Signed-off-by: Chris Ball <chris@printf.net>

diff --git a/drivers/mmc/host/sdhci-spear.c b/drivers/mmc/host/sdhci-spear.c
index 76ddd89a688ee715544e6a09598a59747c5fd561..394714f71b2f6522147814e460ba8b857578c466 100644 (file)
--- a/drivers/mmc/host/sdhci-spear.c
+++ b/drivers/mmc/host/sdhci-spear.c
@@ -129,7 +129,7 @@ static int sdhci_probe(struct platform_device *pdev)
        }
 
        /* clk enable */
-       sdhci->clk = clk_get(&pdev->dev, NULL);
+       sdhci->clk = devm_clk_get(&pdev->dev, NULL);
        if (IS_ERR(sdhci->clk)) {
                ret = PTR_ERR(sdhci->clk);
                dev_dbg(&pdev->dev, "Error getting clock\n");
@@ -139,7 +139,7 @@ static int sdhci_probe(struct platform_device *pdev)
        ret = clk_prepare_enable(sdhci->clk);
        if (ret) {
                dev_dbg(&pdev->dev, "Error enabling clock\n");
-               goto put_clk;
+               goto err;
        }
 
        ret = clk_set_rate(sdhci->clk, 50000000);
@@ -151,7 +151,7 @@ static int sdhci_probe(struct platform_device *pdev)
                sdhci->data = sdhci_probe_config_dt(pdev);
                if (IS_ERR(sdhci->data)) {
                        dev_err(&pdev->dev, "DT: Failed to get pdata\n");
-                       return -ENODEV;
+                       goto disable_clk;
                }
        } else {
                sdhci->data = dev_get_platdata(&pdev->dev);
@@ -261,8 +261,6 @@ free_host:
        sdhci_free_host(host);
 disable_clk:
        clk_disable_unprepare(sdhci->clk);
-put_clk:
-       clk_put(sdhci->clk);
 err:
        dev_err(&pdev->dev, "spear-sdhci probe failed: %d\n", ret);
        return ret;
@@ -282,7 +280,6 @@ static int sdhci_remove(struct platform_device *pdev)
        sdhci_remove_host(host, dead);
        sdhci_free_host(host);
        clk_disable_unprepare(sdhci->clk);
-       clk_put(sdhci->clk);
 
        return 0;
 }