Commit c25d9e1b authored by Jisheng Zhang's avatar Jisheng Zhang Committed by Ulf Hansson

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

Commit 63589e92 ("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: default avatarJisheng Zhang <jszhang@marvell.com>
Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
parent be186ad5
...@@ -398,7 +398,6 @@ static int sdhci_pxav3_probe(struct platform_device *pdev) ...@@ -398,7 +398,6 @@ static int sdhci_pxav3_probe(struct platform_device *pdev)
err_cd_req: err_cd_req:
err_mbus_win: err_mbus_win:
clk_disable_unprepare(pxa->clk_io); 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: err_clk_get:
sdhci_pltfm_free(pdev); sdhci_pltfm_free(pdev);
...@@ -418,7 +417,6 @@ static int sdhci_pxav3_remove(struct platform_device *pdev) ...@@ -418,7 +417,6 @@ static int sdhci_pxav3_remove(struct platform_device *pdev)
sdhci_remove_host(host, 1); sdhci_remove_host(host, 1);
clk_disable_unprepare(pxa->clk_io); 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); sdhci_pltfm_free(pdev);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment