lkml.org 
[lkml]   [2012]   [Aug]   [3]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 1/5] drivers/video/epson1355fb.c: use devm_ functions
    Date
    From: Damien Cassou <damien.cassou@lifl.fr>

    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>

    ---
    drivers/video/epson1355fb.c | 16 ++++++++--------
    1 file changed, 8 insertions(+), 8 deletions(-)

    diff --git a/drivers/video/epson1355fb.c b/drivers/video/epson1355fb.c
    index 68b9b51..246da1e 100644
    --- 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;

    \
     
     \ /
      Last update: 2012-08-03 18:21    [W:0.044 / U:3.528 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site