On 07/31/2012 04:39 PM, Damien Cassou wrote: > From: Damien Cassou <damien.cassou@xxxxxxx> > > 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@xxxxxxx> Applied. Thanks, Florian Tobias Schandinat > > --- > drivers/video/fsl-diu-fb.c | 11 ++--------- > 1 file changed, 2 insertions(+), 9 deletions(-) > > diff --git a/drivers/video/fsl-diu-fb.c b/drivers/video/fsl-diu-fb.c > index 458c006..19194c5 100644 > --- a/drivers/video/fsl-diu-fb.c > +++ b/drivers/video/fsl-diu-fb.c > @@ -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; > } > -- To unsubscribe from this list: send the line "unsubscribe kernel-janitors" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
