Skip to contentSkip to conversation

video: fbdev: uvesafb: Remove redundant NULL check in uvesafb_remove

PATCH In review Wang YanQing 2 participants 2 messages Mar 5, 2014 – Mar 6, 2014

Subsystems (2)
Framebuffer layer Uvesafb driver
lore
Share & tools
lore

Wang YanQing

author
#0 lore raw

PATCH 1/1 video: fbdev: uvesafb: Remove redundant NULL check in uvesafb_remove

Because uvesafb_par is allocated as part of fb_info in uvesafb_probe, so we don't need to do NULL check for both fb_info and uvesafb_par in uvesafb_remove.

[ This patch also fix a warning report by [email protected]
"drivers/video/fbdev/uvesafb.c:1815 uvesafb_remove()
warn: variable dereferenced before check 'par'" ]

Signed-off-by Wang YanQing <[email protected]>
---
 drivers/video/fbdev/uvesafb.c | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)
drivers/video/fbdev/uvesafb.c +3 -5
index 1f38445..18352b2 100644
@@ -1812,11 +1812,9 @@ static int uvesafb_remove(struct platform_device *dev)
 		fb_destroy_modedb(info->monspecs.modedb);
 		fb_dealloc_cmap(&info->cmap);
 
-		if (par) {
-			kfree(par->vbe_modes);
-			kfree(par->vbe_state_orig);
-			kfree(par->vbe_state_saved);
-		}
+		kfree(par->vbe_modes);
+		kfree(par->vbe_state_orig);
+		kfree(par->vbe_state_saved);
 
 		framebuffer_release(info);
 	}
Signature · 1 line
1.8.3.4.8.g69490f3.dirty
#1 lore raw
Quoted 23 lines · Wang YanQing

Because uvesafb_par is allocated as part of fb_info in uvesafb_probe, so we don't need to do NULL check for both fb_info and uvesafb_par in uvesafb_remove.

[ This patch also fix a warning report by [email protected]
"drivers/video/fbdev/uvesafb.c:1815 uvesafb_remove()
warn: variable dereferenced before check 'par'" ]

Signed-off-by Wang YanQing <[email protected]>
---
 drivers/video/fbdev/uvesafb.c | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)
drivers/video/fbdev/uvesafb.c +0 -1
index 1f38445..18352b2 100644
@@ -1812,11 +1812,9 @@ static int uvesafb_remove(struct platform_device *dev)
 		fb_destroy_modedb(info->monspecs.modedb);
 		fb_dealloc_cmap(&info->cmap);
 
-		if (par) {

drivers/video/fbdev/uvesafb.c static int uvesafb_remove(struct platform_device *dev) · line 1820

Quoted 10 lines
drivers/video/fbdev/uvesafb.c +3 -4
-			kfree(par->vbe_modes);
-			kfree(par->vbe_state_orig);
-			kfree(par->vbe_state_saved);
-		}
+		kfree(par->vbe_modes);
+		kfree(par->vbe_state_orig);
+		kfree(par->vbe_state_saved);
 
 		framebuffer_release(info);
 	}

Thanks, queuing for 3.15.

Tomi