OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

da8xx-fb: pass struct device to DMA API functions 

The DMA API generally relies on a struct device to work properly, and
only barely works without one for legacy reasons.  Pass the easily
available struct device from the platform_device to remedy this.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Acked-by: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
This commit is contained in:
Christoph Hellwig 2019-01-23 09:05:27 +01:00
parent 4217efa353
commit 12a7b035ca
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
drivers/video/fbdev/da8xx-fb.c
View File

@ -1097,9 +1097,9 @@ static int fb_remove(struct platform_device *dev)
unregister_framebuffer(info); unregister_framebuffer(info);
fb_dealloc_cmap(&info->cmap); fb_dealloc_cmap(&info->cmap);
dma_free_coherent(NULL, PALETTE_SIZE, par->v_palette_base, dma_free_coherent(par->dev, PALETTE_SIZE, par->v_palette_base,
par->p_palette_base); par->p_palette_base);
dma_free_coherent(NULL, par->vram_size, par->vram_virt, dma_free_coherent(par->dev, par->vram_size, par->vram_virt,
par->vram_phys); par->vram_phys);
pm_runtime_put_sync(&dev->dev); pm_runtime_put_sync(&dev->dev);
pm_runtime_disable(&dev->dev); pm_runtime_disable(&dev->dev);
@ -1425,7 +1425,7 @@ static int fb_probe(struct platform_device *device)
par->vram_size = roundup(par->vram_size/8, ulcm); par->vram_size = roundup(par->vram_size/8, ulcm);
par->vram_size = par->vram_size * LCD_NUM_BUFFERS; par->vram_size = par->vram_size * LCD_NUM_BUFFERS;
par->vram_virt = dma_alloc_coherent(NULL, par->vram_virt = dma_alloc_coherent(par->dev,
par->vram_size, par->vram_size,
&par->vram_phys, &par->vram_phys,
GFP_KERNEL | GFP_DMA); GFP_KERNEL | GFP_DMA);
@ -1446,7 +1446,7 @@ static int fb_probe(struct platform_device *device)
da8xx_fb_fix.line_length - 1; da8xx_fb_fix.line_length - 1;
/* allocate palette buffer */ /* allocate palette buffer */
par->v_palette_base = dma_alloc_coherent(NULL, PALETTE_SIZE, par->v_palette_base = dma_alloc_coherent(par->dev, PALETTE_SIZE,
&par->p_palette_base, &par->p_palette_base,
GFP_KERNEL | GFP_DMA); GFP_KERNEL | GFP_DMA);
if (!par->v_palette_base) { if (!par->v_palette_base) {
@ -1532,11 +1532,12 @@ err_dealloc_cmap:
fb_dealloc_cmap(&da8xx_fb_info->cmap); fb_dealloc_cmap(&da8xx_fb_info->cmap);
err_release_pl_mem: err_release_pl_mem:
dma_free_coherent(NULL, PALETTE_SIZE, par->v_palette_base, dma_free_coherent(par->dev, PALETTE_SIZE, par->v_palette_base,
par->p_palette_base); par->p_palette_base);
err_release_fb_mem: err_release_fb_mem:
dma_free_coherent(NULL, par->vram_size, par->vram_virt, par->vram_phys); dma_free_coherent(par->dev, par->vram_size, par->vram_virt,
par->vram_phys);
err_release_fb: err_release_fb:
framebuffer_release(da8xx_fb_info); framebuffer_release(da8xx_fb_info);