Commit c25d9e1b authored Jan 05, 2015 by Jisheng Zhang Committed by Ulf Hansson Jan 21, 2015

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

parent be186ad5

drivers/mmc/host/sdhci-pxav3.c

+2 −4

Original line number	Diff line number	Diff line
		@@ -398,7 +398,6 @@ 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);
		err_clk_get:
		sdhci_pltfm_free(pdev);
		@@ -418,7 +417,6 @@ 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);

		sdhci_pltfm_free(pdev);

Admin message