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

drivers/video/epson1355fb.c: use devm_ functions 

The various devm_ functions allocate memory that is released when a driver
detaches. This patch uses these functions for data that is allocated in the
probe function of a platform device and is only freed in the remove function.

Signed-off-by: Damien Cassou <damien.cassou@lifl.fr>
Signed-off-by: Florian Tobias Schandinat <FlorianSchandinat@gmx.de>
This commit is contained in:
Damien Cassou 2012-08-03 17:40:10 +02:00 committed by Florian Tobias Schandinat
parent 776213493f
commit e07d232335
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
drivers/video/epson1355fb.c
View File

@ -592,12 +592,8 @@ static int epson1355fb_remove(struct platform_device *dev)
if (info) { if (info) {
fb_dealloc_cmap(&info->cmap); fb_dealloc_cmap(&info->cmap);
if (info->screen_base)
iounmap(info->screen_base);
framebuffer_release(info); framebuffer_release(info);
} }
release_mem_region(EPSON1355FB_FB_PHYS, EPSON1355FB_FB_LEN);
release_mem_region(EPSON1355FB_REGS_PHYS, EPSON1355FB_REGS_LEN);
return 0; return 0;
} }
@ -608,14 +604,17 @@ static int __devinit epson1355fb_probe(struct platform_device *dev)
u8 revision; u8 revision;
int rc = 0; int rc = 0;
if (!request_mem_region(EPSON1355FB_REGS_PHYS, EPSON1355FB_REGS_LEN, "S1D13505 registers")) { if (!devm_request_mem_region(&dev->dev, EPSON1355FB_REGS_PHYS,
EPSON1355FB_REGS_LEN,
"S1D13505 registers")) {
printk(KERN_ERR "epson1355fb: unable to reserve " printk(KERN_ERR "epson1355fb: unable to reserve "
"registers at 0x%0x\n", EPSON1355FB_REGS_PHYS); "registers at 0x%0x\n", EPSON1355FB_REGS_PHYS);
rc = -EBUSY; rc = -EBUSY;
goto bail; goto bail;
} }
if (!request_mem_region(EPSON1355FB_FB_PHYS, EPSON1355FB_FB_LEN, if (!devm_request_mem_region(&dev->dev, EPSON1355FB_FB_PHYS,
EPSON1355FB_FB_LEN,
"S1D13505 framebuffer")) { "S1D13505 framebuffer")) {
printk(KERN_ERR "epson1355fb: unable to reserve " printk(KERN_ERR "epson1355fb: unable to reserve "
"framebuffer at 0x%0x\n", EPSON1355FB_FB_PHYS); "framebuffer at 0x%0x\n", EPSON1355FB_FB_PHYS);
@ -638,7 +637,8 @@ static int __devinit epson1355fb_probe(struct platform_device *dev)
} }
info->pseudo_palette = default_par->pseudo_palette; info->pseudo_palette = default_par->pseudo_palette;
info->screen_base = ioremap(EPSON1355FB_FB_PHYS, EPSON1355FB_FB_LEN); info->screen_base = devm_ioremap(&dev->dev, EPSON1355FB_FB_PHYS,
EPSON1355FB_FB_LEN);
if (!info->screen_base) { if (!info->screen_base) {
printk(KERN_ERR "epson1355fb: unable to map framebuffer\n"); printk(KERN_ERR "epson1355fb: unable to map framebuffer\n");
rc = -ENOMEM; rc = -ENOMEM;