]> git.openfabrics.org - ~emulex/infiniband.git/commitdiff
drivers/video/fsl-diu-fb.c: use devm_ functions
authorDamien Cassou <damien.cassou@lifl.fr>
Tue, 31 Jul 2012 16:39:20 +0000 (18:39 +0200)
committerFlorian Tobias Schandinat <FlorianSchandinat@gmx.de>
Thu, 23 Aug 2012 13:06:12 +0000 (13:06 +0000)
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>
drivers/video/fsl-diu-fb.c

index 458c00664ade6110a6b26d58397086b2b1d4290f..ede9e55413f80ad33e932f48c652785069bb2fb8 100644 (file)
@@ -1501,8 +1501,8 @@ static int __devinit fsl_diu_probe(struct platform_device *pdev)
        unsigned int i;
        int ret;
 
-       data = dma_alloc_coherent(&pdev->dev, sizeof(struct fsl_diu_data),
-                                 &dma_addr, GFP_DMA | __GFP_ZERO);
+       data = dmam_alloc_coherent(&pdev->dev, sizeof(struct fsl_diu_data),
+                                  &dma_addr, GFP_DMA | __GFP_ZERO);
        if (!data)
                return -ENOMEM;
        data->dma_addr = dma_addr;
@@ -1628,9 +1628,6 @@ error:
 
        iounmap(data->diu_reg);
 
-       dma_free_coherent(&pdev->dev, sizeof(struct fsl_diu_data), data,
-                         data->dma_addr);
-
        return ret;
 }
 
@@ -1648,9 +1645,6 @@ static int fsl_diu_remove(struct platform_device *pdev)
 
        iounmap(data->diu_reg);
 
-       dma_free_coherent(&pdev->dev, sizeof(struct fsl_diu_data), data,
-                         data->dma_addr);
-
        return 0;
 }