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:
Родитель
a943710407
Коммит
f2ff0c430f
|
@ -1777,25 +1777,23 @@ out:
|
|||
static int uvesafb_remove(struct platform_device *dev)
|
||||
{
|
||||
struct fb_info *info = platform_get_drvdata(dev);
|
||||
struct uvesafb_par *par = info->par;
|
||||
|
||||
if (info) {
|
||||
struct uvesafb_par *par = info->par;
|
||||
sysfs_remove_group(&dev->dev.kobj, &uvesafb_dev_attgrp);
|
||||
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);
|
||||
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);
|
||||
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);
|
||||
|
||||
framebuffer_release(info);
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
|
Загрузка…
Ссылка в новой задаче