lkml.org 
[lkml]   [2012]   [Aug]   [23]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    /
    Date
    From
    SubjectRe: [PATCH 2/5] drivers/video/gbefb.c: use devm_ functions
    On 07/31/2012 04:39 PM, Damien Cassou wrote:
    > 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>

    Applied.


    Thanks,

    Florian Tobias Schandinat

    >
    > ---
    > drivers/video/gbefb.c | 15 +++++----------
    > 1 file changed, 5 insertions(+), 10 deletions(-)
    >
    > diff --git a/drivers/video/gbefb.c b/drivers/video/gbefb.c
    > index 7e7b7a9..9b79d38 100644
    > --- a/drivers/video/gbefb.c
    > +++ b/drivers/video/gbefb.c
    > @@ -1156,7 +1156,8 @@ static int __devinit gbefb_probe(struct platform_device *p_dev)
    > goto out_release_framebuffer;
    > }
    >
    > - gbe = (struct sgi_gbe *) ioremap(GBE_BASE, sizeof(struct sgi_gbe));
    > + gbe = (struct sgi_gbe *) devm_ioremap(&p_dev->dev, GBE_BASE,
    > + sizeof(struct sgi_gbe));
    > if (!gbe) {
    > printk(KERN_ERR "gbefb: couldn't map mmio region\n");
    > ret = -ENXIO;
    > @@ -1170,12 +1171,13 @@ static int __devinit gbefb_probe(struct platform_device *p_dev)
    > if (!gbe_tiles.cpu) {
    > printk(KERN_ERR "gbefb: couldn't allocate tiles table\n");
    > ret = -ENOMEM;
    > - goto out_unmap;
    > + goto out_release_mem_region;
    > }
    >
    > if (gbe_mem_phys) {
    > /* memory was allocated at boot time */
    > - gbe_mem = ioremap_nocache(gbe_mem_phys, gbe_mem_size);
    > + gbe_mem = devm_ioremap_nocache(&p_dev->dev, gbe_mem_phys,
    > + gbe_mem_size);
    > if (!gbe_mem) {
    > printk(KERN_ERR "gbefb: couldn't map framebuffer\n");
    > ret = -ENOMEM;
    > @@ -1241,13 +1243,9 @@ static int __devinit gbefb_probe(struct platform_device *p_dev)
    > out_gbe_unmap:
    > if (gbe_dma_addr)
    > dma_free_coherent(NULL, gbe_mem_size, gbe_mem, gbe_mem_phys);
    > - else
    > - iounmap(gbe_mem);
    > out_tiles_free:
    > dma_free_coherent(NULL, GBE_TLB_SIZE * sizeof(uint16_t),
    > (void *)gbe_tiles.cpu, gbe_tiles.dma);
    > -out_unmap:
    > - iounmap(gbe);
    > out_release_mem_region:
    > release_mem_region(GBE_BASE, sizeof(struct sgi_gbe));
    > out_release_framebuffer:
    > @@ -1264,12 +1262,9 @@ static int __devexit gbefb_remove(struct platform_device* p_dev)
    > gbe_turn_off();
    > if (gbe_dma_addr)
    > dma_free_coherent(NULL, gbe_mem_size, gbe_mem, gbe_mem_phys);
    > - else
    > - iounmap(gbe_mem);
    > dma_free_coherent(NULL, GBE_TLB_SIZE * sizeof(uint16_t),
    > (void *)gbe_tiles.cpu, gbe_tiles.dma);
    > release_mem_region(GBE_BASE, sizeof(struct sgi_gbe));
    > - iounmap(gbe);
    > gbefb_remove_sysfs(&p_dev->dev);
    > framebuffer_release(info);
    >
    >
    >



    \
     
     \ /
      Last update: 2012-08-23 23:21    [W:2.964 / U:0.280 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site