Message ID | 20170616071716.17321-4-hch@lst.de (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
On Friday, June 16, 2017 09:17:08 AM Christoph Hellwig wrote: > au1100fb is using managed dma allocations, so it doesn't need to > explicitly free the dma memory in the error path (and if it did > it would have to use the managed version). > > Signed-off-by: Christoph Hellwig <hch@lst.de> Acked-by: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com> Best regards, -- Bartlomiej Zolnierkiewicz Samsung R&D Institute Poland Samsung Electronics
On Mon, Jun 19, 2017 at 01:15:04PM +0200, Bartlomiej Zolnierkiewicz wrote: > On Friday, June 16, 2017 09:17:08 AM Christoph Hellwig wrote: > > au1100fb is using managed dma allocations, so it doesn't need to > > explicitly free the dma memory in the error path (and if it did > > it would have to use the managed version). > > > > Signed-off-by: Christoph Hellwig <hch@lst.de> > > Acked-by: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com> Are you fine with picking this up through the new dma-mapping tree?
On Tuesday, June 20, 2017 11:10:45 AM Christoph Hellwig wrote: > On Mon, Jun 19, 2017 at 01:15:04PM +0200, Bartlomiej Zolnierkiewicz wrote: > > On Friday, June 16, 2017 09:17:08 AM Christoph Hellwig wrote: > > > au1100fb is using managed dma allocations, so it doesn't need to > > > explicitly free the dma memory in the error path (and if it did > > > it would have to use the managed version). > > > > > > Signed-off-by: Christoph Hellwig <hch@lst.de> > > > > Acked-by: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com> > > Are you fine with picking this up through the new dma-mapping tree? Yes, this is why Ack-ed it. If you prefer me to merge it through fbdev for 4.13 please let me know. Best regards, -- Bartlomiej Zolnierkiewicz Samsung R&D Institute Poland Samsung Electronics
diff --git a/drivers/video/fbdev/au1100fb.c b/drivers/video/fbdev/au1100fb.c index 35df2c1a8a63..8de42f617d16 100644 --- a/drivers/video/fbdev/au1100fb.c +++ b/drivers/video/fbdev/au1100fb.c @@ -532,10 +532,6 @@ static int au1100fb_drv_probe(struct platform_device *dev) clk_disable_unprepare(fbdev->lcdclk); clk_put(fbdev->lcdclk); } - if (fbdev->fb_mem) { - dma_free_noncoherent(&dev->dev, fbdev->fb_len, fbdev->fb_mem, - fbdev->fb_phys); - } if (fbdev->info.cmap.len != 0) { fb_dealloc_cmap(&fbdev->info.cmap); }
au1100fb is using managed dma allocations, so it doesn't need to explicitly free the dma memory in the error path (and if it did it would have to use the managed version). Signed-off-by: Christoph Hellwig <hch@lst.de> --- drivers/video/fbdev/au1100fb.c | 4 ---- 1 file changed, 4 deletions(-)