hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

drivers/video/mbx/mbxfb.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-07-31 18:39:18 +02:00 committed by Florian Tobias Schandinat
parent e31f874584
commit 0b7ca58961
1 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
drivers/video/mbx/mbxfb.c
View File

@ -939,8 +939,9 @@ static int __devinit mbxfb_probe(struct platform_device *dev)
} }
mfbi->reg_phys_addr = mfbi->reg_res->start; mfbi->reg_phys_addr = mfbi->reg_res->start;
mfbi->reg_virt_addr = ioremap_nocache(mfbi->reg_phys_addr, mfbi->reg_virt_addr = devm_ioremap_nocache(&dev->dev,
res_size(mfbi->reg_req)); mfbi->reg_phys_addr,
res_size(mfbi->reg_req));
if (!mfbi->reg_virt_addr) { if (!mfbi->reg_virt_addr) {
dev_err(&dev->dev, "failed to ioremap Marathon registers\n"); dev_err(&dev->dev, "failed to ioremap Marathon registers\n");
ret = -EINVAL; ret = -EINVAL;
@ -948,12 +949,12 @@ static int __devinit mbxfb_probe(struct platform_device *dev)
} }
virt_base_2700 = mfbi->reg_virt_addr; virt_base_2700 = mfbi->reg_virt_addr;
mfbi->fb_virt_addr = ioremap_nocache(mfbi->fb_phys_addr, mfbi->fb_virt_addr = devm_ioremap_nocache(&dev->dev, mfbi->fb_phys_addr,
res_size(mfbi->fb_req)); res_size(mfbi->fb_req));
if (!mfbi->fb_virt_addr) { if (!mfbi->fb_virt_addr) {
dev_err(&dev->dev, "failed to ioremap frame buffer\n"); dev_err(&dev->dev, "failed to ioremap frame buffer\n");
ret = -EINVAL; ret = -EINVAL;
goto err4; goto err3;
} }
fbi->screen_base = (char __iomem *)(mfbi->fb_virt_addr + 0x60000); fbi->screen_base = (char __iomem *)(mfbi->fb_virt_addr + 0x60000);
@ -971,7 +972,7 @@ static int __devinit mbxfb_probe(struct platform_device *dev)
if (ret < 0) { if (ret < 0) {
dev_err(&dev->dev, "fb_alloc_cmap failed\n"); dev_err(&dev->dev, "fb_alloc_cmap failed\n");
ret = -EINVAL; ret = -EINVAL;
goto err5; goto err3;
} }
platform_set_drvdata(dev, fbi); platform_set_drvdata(dev, fbi);
@ -996,10 +997,6 @@ static int __devinit mbxfb_probe(struct platform_device *dev)
err6: err6:
fb_dealloc_cmap(&fbi->cmap); fb_dealloc_cmap(&fbi->cmap);
err5:
iounmap(mfbi->fb_virt_addr);
err4:
iounmap(mfbi->reg_virt_addr);
err3: err3:
release_mem_region(mfbi->reg_res->start, res_size(mfbi->reg_res)); release_mem_region(mfbi->reg_res->start, res_size(mfbi->reg_res));
err2: err2:
@ -1026,10 +1023,7 @@ static int __devexit mbxfb_remove(struct platform_device *dev)
if (mfbi->platform_remove) if (mfbi->platform_remove)
mfbi->platform_remove(fbi); mfbi->platform_remove(fbi);
if (mfbi->fb_virt_addr)
iounmap(mfbi->fb_virt_addr);
if (mfbi->reg_virt_addr)
iounmap(mfbi->reg_virt_addr);
if (mfbi->reg_req) if (mfbi->reg_req)
release_mem_region(mfbi->reg_req->start, release_mem_region(mfbi->reg_req->start,
res_size(mfbi->reg_req)); res_size(mfbi->reg_req));