video: fbdev: uvesafb: Remove redundant NULL check in uvesafb_remove
authorWang YanQing <udknight@gmail.com>
Wed, 5 Mar 2014 15:54:18 +0000 (23:54 +0800)
committerTomi Valkeinen <tomi.valkeinen@ti.com>
Thu, 6 Mar 2014 09:29:39 +0000 (11:29 +0200)
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 fengguang.wu@intel.com
  "drivers/video/fbdev/uvesafb.c:1815 uvesafb_remove()
   warn: variable dereferenced before check 'par'" ]

Signed-off-by: Wang YanQing <udknight@gmail.com>
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
drivers/video/uvesafb.c

index 256fba7f46416fb0d5b293e2e0829872d6d344a4..70a02a2d60bf4740f4a71aa8e2fd2fc519460b09 100644 (file)
@@ -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);
        }