UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

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 <christophe.jaillet@wanadoo.fr>
Signed-off-by: Helge Deller <deller@gmx.de>
This commit is contained in:
Christophe JAILLET 2022-12-10 12:35:23 +01:00 committed by Helge Deller
parent a943710407
commit f2ff0c430f
1 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
drivers/video/fbdev/uvesafb.c
View File

@ -1777,25 +1777,23 @@ out:
static int uvesafb_remove(struct platform_device *dev) static int uvesafb_remove(struct platform_device *dev)
{ {
struct fb_info *info = platform_get_drvdata(dev); struct fb_info *info = platform_get_drvdata(dev);
struct uvesafb_par *par = info->par;
if (info) { sysfs_remove_group(&dev->dev.kobj, &uvesafb_dev_attgrp);
struct uvesafb_par *par = info->par; unregister_framebuffer(info);
release_region(0x3c0, 32);
iounmap(info->screen_base);
arch_phys_wc_del(par->mtrr_handle);
release_mem_region(info->fix.smem_start, info->fix.smem_len);
fb_destroy_modedb(info->monspecs.modedb);
fb_dealloc_cmap(&info->cmap);
sysfs_remove_group(&dev->dev.kobj, &uvesafb_dev_attgrp); kfree(par->vbe_modes);
unregister_framebuffer(info); kfree(par->vbe_state_orig);
release_region(0x3c0, 32); kfree(par->vbe_state_saved);
iounmap(info->screen_base);
arch_phys_wc_del(par->mtrr_handle);
release_mem_region(info->fix.smem_start, info->fix.smem_len);
fb_destroy_modedb(info->monspecs.modedb);
fb_dealloc_cmap(&info->cmap);
kfree(par->vbe_modes); framebuffer_release(info);
kfree(par->vbe_state_orig);
kfree(par->vbe_state_saved);
framebuffer_release(info);
}
return 0; return 0;
} }