OSDN Git Service

ASoC: imx-audmux: remove unnecessary check of clk_disable_unprepare/clk_prepare_enable
authorMinghao Chi <chi.minghao@zte.com.cn>
Mon, 6 Jun 2022 03:37:05 +0000 (03:37 +0000)
committerMark Brown <broonie@kernel.org>
Thu, 9 Jun 2022 10:57:46 +0000 (11:57 +0100)
Because clk_disable_unprepare/clk_prepare_enable already checked NULL clock
parameter, so the additional checks are unnecessary, just remove them.

Reported-by: Zeal Robot <zealci@zte.com.cn>
Signed-off-by: Minghao Chi <chi.minghao@zte.com.cn>
Acked-by: Shengjiu Wang <shengjiu.wang@gmail.com>
Link: https://lore.kernel.org/r/20220606033705.291048-1-chi.minghao@zte.com.cn
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/fsl/imx-audmux.c

index a8e5e0f..50b71e5 100644 (file)
@@ -62,17 +62,14 @@ static ssize_t audmux_read_file(struct file *file, char __user *user_buf,
        uintptr_t port = (uintptr_t)file->private_data;
        u32 pdcr, ptcr;
 
-       if (audmux_clk) {
-               ret = clk_prepare_enable(audmux_clk);
-               if (ret)
-                       return ret;
-       }
+       ret = clk_prepare_enable(audmux_clk);
+       if (ret)
+               return ret;
 
        ptcr = readl(audmux_base + IMX_AUDMUX_V2_PTCR(port));
        pdcr = readl(audmux_base + IMX_AUDMUX_V2_PDCR(port));
 
-       if (audmux_clk)
-               clk_disable_unprepare(audmux_clk);
+       clk_disable_unprepare(audmux_clk);
 
        buf = kmalloc(PAGE_SIZE, GFP_KERNEL);
        if (!buf)
@@ -209,17 +206,14 @@ int imx_audmux_v2_configure_port(unsigned int port, unsigned int ptcr,
        if (!audmux_base)
                return -ENOSYS;
 
-       if (audmux_clk) {
-               ret = clk_prepare_enable(audmux_clk);
-               if (ret)
-                       return ret;
-       }
+       ret = clk_prepare_enable(audmux_clk);
+       if (ret)
+               return ret;
 
        writel(ptcr, audmux_base + IMX_AUDMUX_V2_PTCR(port));
        writel(pdcr, audmux_base + IMX_AUDMUX_V2_PDCR(port));
 
-       if (audmux_clk)
-               clk_disable_unprepare(audmux_clk);
+       clk_disable_unprepare(audmux_clk);
 
        return 0;
 }