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>

diff --git a/drivers/video/epson1355fb.c b/drivers/video/epson1355fb.c
index 68b9b511ce80257761a75f5297fcacc0795e283b..246da1e2968c7f838867f034ede4ba758ed9b942 100644 (file)
--- a/drivers/video/epson1355fb.c
+++ b/drivers/video/epson1355fb.c
@@ -592,12 +592,8 @@ static int epson1355fb_remove(struct platform_device *dev)
 
        if (info) {
                fb_dealloc_cmap(&info->cmap);
-               if (info->screen_base)
-                       iounmap(info->screen_base);
                framebuffer_release(info);
        }
-       release_mem_region(EPSON1355FB_FB_PHYS, EPSON1355FB_FB_LEN);
-       release_mem_region(EPSON1355FB_REGS_PHYS, EPSON1355FB_REGS_LEN);
        return 0;
 }
 
@@ -608,15 +604,18 @@ static int __devinit epson1355fb_probe(struct platform_device *dev)
        u8 revision;
        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 "
                       "registers at 0x%0x\n", EPSON1355FB_REGS_PHYS);
                rc = -EBUSY;
                goto bail;
        }
 
-       if (!request_mem_region(EPSON1355FB_FB_PHYS, EPSON1355FB_FB_LEN,
-                               "S1D13505 framebuffer")) {
+       if (!devm_request_mem_region(&dev->dev, EPSON1355FB_FB_PHYS,
+                                    EPSON1355FB_FB_LEN,
+                                    "S1D13505 framebuffer")) {
                printk(KERN_ERR "epson1355fb: unable to reserve "
                       "framebuffer at 0x%0x\n", EPSON1355FB_FB_PHYS);
                rc = -EBUSY;
@@ -638,7 +637,8 @@ static int __devinit epson1355fb_probe(struct platform_device *dev)
        }
        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) {
                printk(KERN_ERR "epson1355fb: unable to map framebuffer\n");
                rc = -ENOMEM;