diff options
author | Julia Lawall <julia.lawall@lip6.fr> | 2012-01-21 10:01:58 -0500 |
---|---|---|
committer | Florian Tobias Schandinat <FlorianSchandinat@gmx.de> | 2012-01-28 15:47:52 -0500 |
commit | 1c16697bf9d5b206cb0d2b905a54de5e077296be (patch) | |
tree | 1d28548fb55a4178c23365e647ec626d4cc62d68 /drivers/video/au1200fb.c | |
parent | 92a9c19a89af2ca219fbb040a0059f414a4b7223 (diff) |
drivers/video/au*fb.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.
In au1100fb.c, the probe function now returns -ENODEV on failure.
Signed-off-by: Julia Lawall <Julia.Lawall@lip6.fr>
Acked-by: Manuel Lauss <manuel.lauss@googlemail.com>
Signed-off-by: Florian Tobias Schandinat <FlorianSchandinat@gmx.de>
Diffstat (limited to 'drivers/video/au1200fb.c')
-rw-r--r-- | drivers/video/au1200fb.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/drivers/video/au1200fb.c b/drivers/video/au1200fb.c index 04e4479d5af..3e9a773db09 100644 --- a/drivers/video/au1200fb.c +++ b/drivers/video/au1200fb.c | |||
@@ -1724,7 +1724,7 @@ static int __devinit au1200fb_drv_probe(struct platform_device *dev) | |||
1724 | /* Allocate the framebuffer to the maximum screen size */ | 1724 | /* Allocate the framebuffer to the maximum screen size */ |
1725 | fbdev->fb_len = (win->w[plane].xres * win->w[plane].yres * bpp) / 8; | 1725 | fbdev->fb_len = (win->w[plane].xres * win->w[plane].yres * bpp) / 8; |
1726 | 1726 | ||
1727 | fbdev->fb_mem = dma_alloc_noncoherent(&dev->dev, | 1727 | fbdev->fb_mem = dmam_alloc_noncoherent(&dev->dev, &dev->dev, |
1728 | PAGE_ALIGN(fbdev->fb_len), | 1728 | PAGE_ALIGN(fbdev->fb_len), |
1729 | &fbdev->fb_phys, GFP_KERNEL); | 1729 | &fbdev->fb_phys, GFP_KERNEL); |
1730 | if (!fbdev->fb_mem) { | 1730 | if (!fbdev->fb_mem) { |
@@ -1788,9 +1788,6 @@ static int __devinit au1200fb_drv_probe(struct platform_device *dev) | |||
1788 | 1788 | ||
1789 | failed: | 1789 | failed: |
1790 | /* NOTE: This only does the current plane/window that failed; others are still active */ | 1790 | /* NOTE: This only does the current plane/window that failed; others are still active */ |
1791 | if (fbdev->fb_mem) | ||
1792 | dma_free_noncoherent(&dev->dev, PAGE_ALIGN(fbdev->fb_len), | ||
1793 | fbdev->fb_mem, fbdev->fb_phys); | ||
1794 | if (fbi) { | 1791 | if (fbi) { |
1795 | if (fbi->cmap.len != 0) | 1792 | if (fbi->cmap.len != 0) |
1796 | fb_dealloc_cmap(&fbi->cmap); | 1793 | fb_dealloc_cmap(&fbi->cmap); |
@@ -1817,10 +1814,6 @@ static int __devexit au1200fb_drv_remove(struct platform_device *dev) | |||
1817 | 1814 | ||
1818 | /* Clean up all probe data */ | 1815 | /* Clean up all probe data */ |
1819 | unregister_framebuffer(fbi); | 1816 | unregister_framebuffer(fbi); |
1820 | if (fbdev->fb_mem) | ||
1821 | dma_free_noncoherent(&dev->dev, | ||
1822 | PAGE_ALIGN(fbdev->fb_len), | ||
1823 | fbdev->fb_mem, fbdev->fb_phys); | ||
1824 | if (fbi->cmap.len != 0) | 1817 | if (fbi->cmap.len != 0) |
1825 | fb_dealloc_cmap(&fbi->cmap); | 1818 | fb_dealloc_cmap(&fbi->cmap); |
1826 | kfree(fbi->pseudo_palette); | 1819 | kfree(fbi->pseudo_palette); |