Commit 12a7b035 authored by Christoph Hellwig's avatar Christoph Hellwig
Browse files

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: default avatarChristoph Hellwig <hch@lst.de>
Acked-by: default avatarBartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
parent 4217efa3
Loading
Loading
Loading
Loading
+7 −6
Original line number Diff line number Diff line
@@ -1097,9 +1097,9 @@ static int fb_remove(struct platform_device *dev)

		unregister_framebuffer(info);
		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);
		dma_free_coherent(NULL, par->vram_size, par->vram_virt,
		dma_free_coherent(par->dev, par->vram_size, par->vram_virt,
				  par->vram_phys);
		pm_runtime_put_sync(&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 = 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_phys,
					    GFP_KERNEL | GFP_DMA);
@@ -1446,7 +1446,7 @@ static int fb_probe(struct platform_device *device)
		da8xx_fb_fix.line_length - 1;

	/* 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,
						 GFP_KERNEL | GFP_DMA);
	if (!par->v_palette_base) {
@@ -1532,11 +1532,12 @@ err_dealloc_cmap:
	fb_dealloc_cmap(&da8xx_fb_info->cmap);

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);

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:
	framebuffer_release(da8xx_fb_info);