UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

mtd: rawnand: rockchip: Check before clk_disable_unprepare() not needed 

All code in clk_disable_unprepare() already checks the clk ptr using
IS_ERR_OR_NULL so there is no need to check it again before calling it.
A lot of other drivers already rely on this behaviour, so it's safe
to do so here.

Signed-off-by: Phil Edworthy <phil.edworthy@renesas.com>
Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com>
Link: https://lore.kernel.org/linux-mtd/20220512184558.45966-1-phil.edworthy@renesas.com
This commit is contained in:
Phil Edworthy 2022-05-12 19:45:58 +01:00 committed by Miquel Raynal
parent 66d7a40beb
commit 6879854d16
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/mtd/nand/raw/rockchip-nand-controller.c
View File

@ -911,7 +911,6 @@ static int rk_nfc_enable_clks(struct device *dev, struct rk_nfc *nfc)
ret = clk_prepare_enable(nfc->ahb_clk); ret = clk_prepare_enable(nfc->ahb_clk);
if (ret) { if (ret) {
dev_err(dev, "failed to enable ahb clk\n"); dev_err(dev, "failed to enable ahb clk\n");
if (!IS_ERR(nfc->nfc_clk))
clk_disable_unprepare(nfc->nfc_clk); clk_disable_unprepare(nfc->nfc_clk);
return ret; return ret;
} }
@ -921,7 +920,6 @@ static int rk_nfc_enable_clks(struct device *dev, struct rk_nfc *nfc)
static void rk_nfc_disable_clks(struct rk_nfc *nfc) static void rk_nfc_disable_clks(struct rk_nfc *nfc)
{ {
if (!IS_ERR(nfc->nfc_clk))
clk_disable_unprepare(nfc->nfc_clk); clk_disable_unprepare(nfc->nfc_clk);
clk_disable_unprepare(nfc->ahb_clk); clk_disable_unprepare(nfc->ahb_clk);
} }