Skip to content

Commit f2ff0c4

Browse files
tititiou36hdeller
authored andcommitted
fbdev: uvesafb: Simplify uvesafb_remove()
When the remove() function is called, we know that the probe() function has successfully been executed. So 'info' is known to be not NULL. Simplify the code accordingly. Signed-off-by: Christophe JAILLET <[email protected]> Signed-off-by: Helge Deller <[email protected]>
1 parent a943710 commit f2ff0c4

File tree

1 file changed

+13
-15
lines changed

1 file changed

+13
-15
lines changed

drivers/video/fbdev/uvesafb.c

Lines changed: 13 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1777,25 +1777,23 @@ static int uvesafb_probe(struct platform_device *dev)
17771777
static int uvesafb_remove(struct platform_device *dev)
17781778
{
17791779
struct fb_info *info = platform_get_drvdata(dev);
1780+
struct uvesafb_par *par = info->par;
17801781

1781-
if (info) {
1782-
struct uvesafb_par *par = info->par;
1782+
sysfs_remove_group(&dev->dev.kobj, &uvesafb_dev_attgrp);
1783+
unregister_framebuffer(info);
1784+
release_region(0x3c0, 32);
1785+
iounmap(info->screen_base);
1786+
arch_phys_wc_del(par->mtrr_handle);
1787+
release_mem_region(info->fix.smem_start, info->fix.smem_len);
1788+
fb_destroy_modedb(info->monspecs.modedb);
1789+
fb_dealloc_cmap(&info->cmap);
17831790

1784-
sysfs_remove_group(&dev->dev.kobj, &uvesafb_dev_attgrp);
1785-
unregister_framebuffer(info);
1786-
release_region(0x3c0, 32);
1787-
iounmap(info->screen_base);
1788-
arch_phys_wc_del(par->mtrr_handle);
1789-
release_mem_region(info->fix.smem_start, info->fix.smem_len);
1790-
fb_destroy_modedb(info->monspecs.modedb);
1791-
fb_dealloc_cmap(&info->cmap);
1791+
kfree(par->vbe_modes);
1792+
kfree(par->vbe_state_orig);
1793+
kfree(par->vbe_state_saved);
17921794

1793-
kfree(par->vbe_modes);
1794-
kfree(par->vbe_state_orig);
1795-
kfree(par->vbe_state_saved);
1795+
framebuffer_release(info);
17961796

1797-
framebuffer_release(info);
1798-
}
17991797
return 0;
18001798
}
18011799

0 commit comments

Comments
 (0)