mmc: sdhci-pxav3: Remove checks for optional core clock in error/remove path

Commit 63589e92c2d9 ("clk: Ignore error and NULL pointers passed to
clk_{unprepare, disable}()") allows NULL or error pointer to be passed
unconditionally.

This patch is to simplify probe error and remove code paths.

However, we reserve the core clock checks in runtime suspend/resume code
because we want a little smaller latency.

Signed-off-by: Jisheng Zhang <jszhang@marvell.com>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>

diff --git a/drivers/mmc/host/sdhci-pxav3.c b/drivers/mmc/host/sdhci-pxav3.c
index 4de39fb6dc2df0d74d78e035b3c7c80615abf1ca..63967b85dc4221fb3d2bef7d2563a6d553429e0e 100644 (file)
--- a/drivers/mmc/host/sdhci-pxav3.c
+++ b/drivers/mmc/host/sdhci-pxav3.c
@@ -398,8 +398,7 @@ err_of_parse:
 err_cd_req:
 err_mbus_win:
        clk_disable_unprepare(pxa->clk_io);
-       if (!IS_ERR(pxa->clk_core))
-               clk_disable_unprepare(pxa->clk_core);
+       clk_disable_unprepare(pxa->clk_core);
 err_clk_get:
        sdhci_pltfm_free(pdev);
        return ret;
@@ -418,8 +417,7 @@ static int sdhci_pxav3_remove(struct platform_device *pdev)
        sdhci_remove_host(host, 1);
 
        clk_disable_unprepare(pxa->clk_io);
-       if (!IS_ERR(pxa->clk_core))
-               clk_disable_unprepare(pxa->clk_core);
+       clk_disable_unprepare(pxa->clk_core);
 
        sdhci_pltfm_free(pdev);