[PATCH] au1100fb: Remove NULL pointer check before clk_enable/disable
Subsystems:
framebuffer layer , the rest
2180d
3 messages,
2 authors,
2020-10-19 · open the first message on its own page
Because clk_enable, clk_disable, clk_prepare, and clk_unprepare already
checked NULL clock parameter, so the additional checks are unnecessary,
just remove them.
Signed-off-by: Xu Wang <redacted>
---
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 37a6512feda0..3659dfbb81c1 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
Hi
On Wed, 14 Oct 2020 08:21:37 +0000 Xu Wang [off-list ref] wrote:
Because clk_enable, clk_disable, clk_prepare, and clk_unprepare already
checked NULL clock parameter, so the additional checks are unnecessary,
just remove them.
All clk_*() functions seem to handle NULL pointers gracefully, so you can
also remove these checks from the driver's _probe and _remove functions.
Best regards
Thomas
quoted hunk
Signed-off-by: Xu Wang <redacted>
---
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 37a6512feda0..3659dfbb81c1 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);
--
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
Hi
On 14.10.20 10:21, Xu Wang wrote: Because clk_enable, clk_disable, clk_prepare, and clk_unprepare already
checked NULL clock parameter, so the additional checks are unnecessary,
just remove them.
Signed-off-by: Xu Wang <redacted>
Sam convinced me to merge this patch as-is with out the additional
cleanup of the driver. So
Reviewed-by: Thomas Zimmermann <tzimmermann@suse.de>
I'll merge it into drm-misc-next.
I'd still like to encourage you to send a patch for the other clk_*
calls in au1100fb.
Best regard
Thomas
quoted hunk - -- 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 37a6512feda0..3659dfbb81c1 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 );
--
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