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

Thomas Zimmermann tzimmermann at suse.de
Fri Oct 16 09:53:56 UTC 2020


On Thu, 15 Oct 2020 10:08:27 +0200 Thomas Zimmermann <tzimmermann at suse.de>
wrote:

> On Wed, 14 Oct 2020 08:49:20 +0000 Xu Wang <vulab at iscas.ac.cn> 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 <vulab at iscas.ac.cn>
> 
> Reviewed-by: Thomas Zimmermann <tzimmermann at suse.de>
> 

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


More information about the dri-devel mailing list