2020-10-14 09:21:30

by Xu Wang

[permalink] [raw]
Subject: [PATCH] omapfb/dss: Remove redundant null check before clk_prepare_enable/clk_disable_unprepare

Because clk_prepare_enable() and clk_disable_unprepare() already checked
NULL clock parameter, so the additional checks are unnecessary, just
remove them.

Signed-off-by: Xu Wang <[email protected]>
---
drivers/video/fbdev/omap2/omapfb/dss/venc.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/drivers/video/fbdev/omap2/omapfb/dss/venc.c b/drivers/video/fbdev/omap2/omapfb/dss/venc.c
index 0b0ad20afd63..8895fb8493d8 100644
--- a/drivers/video/fbdev/omap2/omapfb/dss/venc.c
+++ b/drivers/video/fbdev/omap2/omapfb/dss/venc.c
@@ -890,8 +890,7 @@ static int venc_remove(struct platform_device *pdev)

static int venc_runtime_suspend(struct device *dev)
{
- if (venc.tv_dac_clk)
- clk_disable_unprepare(venc.tv_dac_clk);
+ clk_disable_unprepare(venc.tv_dac_clk);

dispc_runtime_put();

@@ -906,8 +905,7 @@ static int venc_runtime_resume(struct device *dev)
if (r < 0)
return r;

- if (venc.tv_dac_clk)
- clk_prepare_enable(venc.tv_dac_clk);
+ clk_prepare_enable(venc.tv_dac_clk);

return 0;
}
--
2.17.1


2020-10-15 17:57:40

by Thomas Zimmermann

[permalink] [raw]
Subject: Re: [PATCH] omapfb/dss: Remove redundant null check before clk_prepare_enable/clk_disable_unprepare

On Wed, 14 Oct 2020 08:49:20 +0000 Xu Wang <[email protected]> wrote:

> Because clk_prepare_enable() and clk_disable_unprepare() already checked
> NULL clock parameter, so the additional checks are unnecessary, just
> remove them.
>
> Signed-off-by: Xu Wang <[email protected]>

Reviewed-by: Thomas Zimmermann <[email protected]>

> ---
> drivers/video/fbdev/omap2/omapfb/dss/venc.c | 6 ++----
> 1 file changed, 2 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/video/fbdev/omap2/omapfb/dss/venc.c
> b/drivers/video/fbdev/omap2/omapfb/dss/venc.c index
> 0b0ad20afd63..8895fb8493d8 100644 ---
> a/drivers/video/fbdev/omap2/omapfb/dss/venc.c +++
> b/drivers/video/fbdev/omap2/omapfb/dss/venc.c @@ -890,8 +890,7 @@ static
> int venc_remove(struct platform_device *pdev)
> static int venc_runtime_suspend(struct device *dev)
> {
> - if (venc.tv_dac_clk)
> - clk_disable_unprepare(venc.tv_dac_clk);
> + clk_disable_unprepare(venc.tv_dac_clk);
>
> dispc_runtime_put();
>
> @@ -906,8 +905,7 @@ static int venc_runtime_resume(struct device *dev)
> if (r < 0)
> return r;
>
> - if (venc.tv_dac_clk)
> - clk_prepare_enable(venc.tv_dac_clk);
> + clk_prepare_enable(venc.tv_dac_clk);
>
> return 0;
> }



--
Thomas Zimmermann
Graphics Driver Developer
SUSE Software Solutions Germany GmbH
Maxfeldstr. 5, 90409 Nürnberg, Germany
(HRB 36809, AG Nürnberg)
Geschäftsführer: Felix Imendörffer

2020-10-16 09:55:17

by Thomas Zimmermann

[permalink] [raw]
Subject: Re: [PATCH] omapfb/dss: Remove redundant null check before clk_prepare_enable/clk_disable_unprepare

On Thu, 15 Oct 2020 10:08:27 +0200 Thomas Zimmermann <[email protected]>
wrote:

> On Wed, 14 Oct 2020 08:49:20 +0000 Xu Wang <[email protected]> wrote:
>
> > Because clk_prepare_enable() and clk_disable_unprepare() already checked
> > NULL clock parameter, so the additional checks are unnecessary, just
> > remove them.
> >
> > Signed-off-by: Xu Wang <[email protected]>
>
> Reviewed-by: Thomas Zimmermann <[email protected]>
>

Merged into drm-misc-next. Thanks!

> > ---
> > drivers/video/fbdev/omap2/omapfb/dss/venc.c | 6 ++----
> > 1 file changed, 2 insertions(+), 4 deletions(-)
> >
> > diff --git a/drivers/video/fbdev/omap2/omapfb/dss/venc.c
> > b/drivers/video/fbdev/omap2/omapfb/dss/venc.c index
> > 0b0ad20afd63..8895fb8493d8 100644 ---
> > a/drivers/video/fbdev/omap2/omapfb/dss/venc.c +++
> > b/drivers/video/fbdev/omap2/omapfb/dss/venc.c @@ -890,8 +890,7 @@ static
> > int venc_remove(struct platform_device *pdev)
> > static int venc_runtime_suspend(struct device *dev)
> > {
> > - if (venc.tv_dac_clk)
> > - clk_disable_unprepare(venc.tv_dac_clk);
> > + clk_disable_unprepare(venc.tv_dac_clk);
> >
> > dispc_runtime_put();
> >
> > @@ -906,8 +905,7 @@ static int venc_runtime_resume(struct device *dev)
> > if (r < 0)
> > return r;
> >
> > - if (venc.tv_dac_clk)
> > - clk_prepare_enable(venc.tv_dac_clk);
> > + clk_prepare_enable(venc.tv_dac_clk);
> >
> > return 0;
> > }
>
>
>



--
Thomas Zimmermann
Graphics Driver Developer
SUSE Software Solutions Germany GmbH
Maxfeldstr. 5, 90409 Nürnberg, Germany
(HRB 36809, AG Nürnberg)
Geschäftsführer: Felix Imendörffer

2020-10-16 12:48:35

by Thomas Zimmermann

[permalink] [raw]
Subject: Re: [PATCH] omapfb/dss: Remove redundant null check before clk_prepare_enable/clk_disable_unprepare

On Thu, 15 Oct 2020 10:08:27 +0200 Thomas Zimmermann <[email protected]>
wrote:

> On Wed, 14 Oct 2020 08:49:20 +0000 Xu Wang <[email protected]> wrote:
>
> > Because clk_prepare_enable() and clk_disable_unprepare() already checked
> > NULL clock parameter, so the additional checks are unnecessary, just
> > remove them.
> >
> > Signed-off-by: Xu Wang <[email protected]>
>
> Reviewed-by: Thomas Zimmermann <[email protected]>
>

Merged into drm-misc-next. Thanks!

> > ---
> > drivers/video/fbdev/omap2/omapfb/dss/venc.c | 6 ++----
> > 1 file changed, 2 insertions(+), 4 deletions(-)
> >
> > diff --git a/drivers/video/fbdev/omap2/omapfb/dss/venc.c
> > b/drivers/video/fbdev/omap2/omapfb/dss/venc.c index
> > 0b0ad20afd63..8895fb8493d8 100644 ---
> > a/drivers/video/fbdev/omap2/omapfb/dss/venc.c +++
> > b/drivers/video/fbdev/omap2/omapfb/dss/venc.c @@ -890,8 +890,7 @@ static
> > int venc_remove(struct platform_device *pdev)
> > static int venc_runtime_suspend(struct device *dev)
> > {
> > - if (venc.tv_dac_clk)
> > - clk_disable_unprepare(venc.tv_dac_clk);
> > + clk_disable_unprepare(venc.tv_dac_clk);
> >
> > dispc_runtime_put();
> >
> > @@ -906,8 +905,7 @@ static int venc_runtime_resume(struct device *dev)
> > if (r < 0)
> > return r;
> >
> > - if (venc.tv_dac_clk)
> > - clk_prepare_enable(venc.tv_dac_clk);
> > + clk_prepare_enable(venc.tv_dac_clk);
> >
> > return 0;
> > }
>
>
>



--
Thomas Zimmermann
Graphics Driver Developer
SUSE Software Solutions Germany GmbH
Maxfeldstr. 5, 90409 Nürnberg, Germany
(HRB 36809, AG Nürnberg)
Geschäftsführer: Felix Imendörffer