2022-06-08 12:46:58

by Yihao Han

Subject: [PATCH] video: fbdev: au1100fb: Check before some function not needed

clk_disable() already checks the clk ptr using IS_ERR_OR_NULL(clk)
and clk_enable() checks the clk ptr using !clk, so there is no
need to check clk ptr again before calling them.

Signed-off-by: Yihao Han <[email protected]>
---
drivers/video/fbdev/au1100fb.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/drivers/video/fbdev/au1100fb.c b/drivers/video/fbdev/au1100fb.c
index 52f731a61482..519313b8bb00 100644
--- a/drivers/video/fbdev/au1100fb.c
+++ b/drivers/video/fbdev/au1100fb.c
@@ -560,8 +560,7 @@ int au1100fb_drv_suspend(struct platform_device *dev, pm_message_t state)
/* Blank the LCD */
au1100fb_fb_blank(VESA_POWERDOWN, &fbdev->info);

- if (fbdev->lcdclk)
- clk_disable(fbdev->lcdclk);
+ clk_disable(fbdev->lcdclk);

memcpy(&fbregs, fbdev->regs, sizeof(struct au1100fb_regs));

@@ -577,8 +576,7 @@ int au1100fb_drv_resume(struct platform_device *dev)

memcpy(fbdev->regs, &fbregs, sizeof(struct au1100fb_regs));

- if (fbdev->lcdclk)
- clk_enable(fbdev->lcdclk);
+ clk_enable(fbdev->lcdclk);

/* Unblank the LCD */
au1100fb_fb_blank(VESA_NO_BLANKING, &fbdev->info);
--
2.17.1

2022-06-20 19:07:50

by Helge Deller

Subject: Re: [PATCH] video: fbdev: au1100fb: Check before some function not needed

On 6/8/22 13:43, Yihao Han wrote:
> clk_disable() already checks the clk ptr using IS_ERR_OR_NULL(clk)
> and clk_enable() checks the clk ptr using !clk, so there is no
> need to check clk ptr again before calling them.
>
> Signed-off-by: Yihao Han <[email protected]>

applied to fbdev tree.

Thanks!
Helge

> ---
> drivers/video/fbdev/au1100fb.c | 6 ++----
> 1 file changed, 2 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/video/fbdev/au1100fb.c b/drivers/video/fbdev/au1100fb.c
> index 52f731a61482..519313b8bb00 100644
> --- a/drivers/video/fbdev/au1100fb.c
> +++ b/drivers/video/fbdev/au1100fb.c
> @@ -560,8 +560,7 @@ int au1100fb_drv_suspend(struct platform_device *dev, pm_message_t state)
> /* Blank the LCD */
> au1100fb_fb_blank(VESA_POWERDOWN, &fbdev->info);
>
> - if (fbdev->lcdclk)
> - clk_disable(fbdev->lcdclk);
> + clk_disable(fbdev->lcdclk);
>
> memcpy(&fbregs, fbdev->regs, sizeof(struct au1100fb_regs));
>
> @@ -577,8 +576,7 @@ int au1100fb_drv_resume(struct platform_device *dev)
>
> memcpy(fbdev->regs, &fbregs, sizeof(struct au1100fb_regs));
>
> - if (fbdev->lcdclk)
> - clk_enable(fbdev->lcdclk);
> + clk_enable(fbdev->lcdclk);
>
> /* Unblank the LCD */
> au1100fb_fb_blank(VESA_NO_BLANKING, &fbdev->info);