| Message ID | 20220606033705.291048-1-chi.minghao@zte.com.cn (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 142d456204cf4dabe18be59e043d806440f609d4 |
| Headers | show |
| Series | [V2] ASoC: imx-audmux: remove unnecessary check of clk_disable_unprepare/clk_prepare_enable | expand |
On Mon, Jun 6, 2022 at 11:37 AM <cgel.zte@gmail.com> wrote: > From: Minghao Chi <chi.minghao@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@zte.com.cn> > Signed-off-by: Minghao Chi <chi.minghao@zte.com.cn> > Acked-by: Shengjiu Wang <shengjiu.wang@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 > > >
On Mon, 6 Jun 2022 03:37:05 +0000, cgel.zte@gmail.com wrote: > From: Minghao Chi <chi.minghao@zte.com.cn> > > Because clk_disable_unprepare/clk_prepare_enable already checked NULL clock > parameter, so the additional checks are unnecessary, just remove them. > > Applied to https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next Thanks! [1/1] ASoC: imx-audmux: remove unnecessary check of clk_disable_unprepare/clk_prepare_enable commit: 142d456204cf4dabe18be59e043d806440f609d4 All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted. You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed. If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced. Please add any relevant lists and maintainers to the CCs when replying to this mail. Thanks, Mark
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; }