mtd: rawnand: rockchip: Check before clk_disable_unprepare() not needed
authorPhil Edworthy <phil.edworthy@renesas.com>
Thu, 12 May 2022 18:45:58 +0000 (19:45 +0100)
committerMiquel Raynal <miquel.raynal@bootlin.com>
Mon, 16 May 2022 16:34:36 +0000 (18:34 +0200)
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
drivers/mtd/nand/raw/rockchip-nand-controller.c

index cbaa4f1c83da45e2c7d7a71c53ae2b1b890e1c53..f133985cc053a0703aed1e191b4d32310e516770 100644 (file)
@@ -911,8 +911,7 @@ static int rk_nfc_enable_clks(struct device *dev, struct rk_nfc *nfc)
        ret = clk_prepare_enable(nfc->ahb_clk);
        if (ret) {
                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;
        }
 
@@ -921,8 +920,7 @@ static int rk_nfc_enable_clks(struct device *dev, 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);
 }