hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

mmc: dw_mmc: remove the unnecessary IS_ERR() checking for ciu/biu clock 

If ciu/biu clock are NULL, clk_disable_unprepare should be just
returned. In clk_disable_unprepare(), already checked whether clk is
error or NULL.

Signed-off-by: Jaehoon Chung <jh80.chung@samsung.com>
Reviewed-by: Shawn Lin <shawn.lin@rock-chips.com>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
This commit is contained in:
Jaehoon Chung 2016-07-15 10:54:08 +09:00 committed by Ulf Hansson
parent 00f400b73b
commit 7037f3beae
1 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
drivers/mmc/host/dw_mmc.c
View File

@ -3151,12 +3151,10 @@ err_dmaunmap:
host->dma_ops->exit(host); host->dma_ops->exit(host);
err_clk_ciu: err_clk_ciu:
if (!IS_ERR(host->ciu_clk)) clk_disable_unprepare(host->ciu_clk);
clk_disable_unprepare(host->ciu_clk);
err_clk_biu: err_clk_biu:
if (!IS_ERR(host->biu_clk)) clk_disable_unprepare(host->biu_clk);
clk_disable_unprepare(host->biu_clk);
return ret; return ret;
} }
@ -3182,11 +3180,8 @@ void dw_mci_remove(struct dw_mci *host)
if (host->use_dma && host->dma_ops->exit) if (host->use_dma && host->dma_ops->exit)
host->dma_ops->exit(host); host->dma_ops->exit(host);
if (!IS_ERR(host->ciu_clk)) clk_disable_unprepare(host->ciu_clk);
clk_disable_unprepare(host->ciu_clk); clk_disable_unprepare(host->biu_clk);
if (!IS_ERR(host->biu_clk))
clk_disable_unprepare(host->biu_clk);
} }
EXPORT_SYMBOL(dw_mci_remove); EXPORT_SYMBOL(dw_mci_remove);