[PATCH V2] ASoC: imx-audmux: remove unnecessary check of clk_disable_unprepare/clk_prepare_enable

[Shengjiu Wang]

On Mon, Jun 6, 2022 at 11:37 AM <cgel.zte at gmail.com> wrote:

> From: Minghao Chi <chi.minghao at zte.com.cn>
>
> 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 at zte.com.cn>
> Signed-off-by: Minghao Chi <chi.minghao at zte.com.cn>
>

Acked-by: Shengjiu Wang <shengjiu.wang at gmail.com>

Best regards
Wang Shengjiu

> ---
> v1->v2:
>         remove the check of audmux_clk before "clk_prepare_enable"
>  sound/soc/fsl/imx-audmux.c | 22 ++++++++--------------
>  1 file changed, 8 insertions(+), 14 deletions(-)
>
> diff --git a/sound/soc/fsl/imx-audmux.c b/sound/soc/fsl/imx-audmux.c
> index dfa05d40b276..3ba82adace42 100644
> --- a/sound/soc/fsl/imx-audmux.c
> +++ b/sound/soc/fsl/imx-audmux.c
> @@ -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;
>  }
> --
> 2.25.1
>
>
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.ozlabs.org/pipermail/linuxppc-dev/attachments/20220609/1754a7ae/attachment.htm>