Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 671da5f3 authored by Bartosz Golaszewski's avatar Bartosz Golaszewski Committed by Sekhar Nori
Browse files

fbdev: da8xx: use resource management for dma 



Use managed variants of dma alloc functions in the da8xx fbdev driver.

Signed-off-by: default avatarBartosz Golaszewski <bgolaszewski@baylibre.com>
Acked-by: default avatarBartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
Signed-off-by: default avatarSekhar Nori <nsekhar@ti.com>
parent 8a3665f7

drivers/video/fbdev/da8xx-fb.c

+10 −22
Original line number Diff line number Diff line
@@ -1087,10 +1087,6 @@ static int fb_remove(struct platform_device *dev) 


	unregister_framebuffer(info);

	fb_dealloc_cmap(&info->cmap);

	dma_free_coherent(par->dev, PALETTE_SIZE, par->v_palette_base,

			  par->p_palette_base);

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

	framebuffer_release(info);
@@ -1427,7 +1423,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(par->dev,

	par->vram_virt = dmam_alloc_coherent(par->dev,

					     par->vram_size,

					     &par->vram_phys,

					     GFP_KERNEL | GFP_DMA);
@@ -1448,20 +1444,20 @@ static int fb_probe(struct platform_device *device) 
		da8xx_fb_fix.line_length - 1;



	/* allocate palette buffer */

	par->v_palette_base = dma_alloc_coherent(par->dev, PALETTE_SIZE,

	par->v_palette_base = dmam_alloc_coherent(par->dev, PALETTE_SIZE,

						  &par->p_palette_base,

						  GFP_KERNEL | GFP_DMA);

	if (!par->v_palette_base) {

		dev_err(&device->dev,

			"GLCD: kmalloc for palette buffer failed\n");

		ret = -EINVAL;

		goto err_release_fb_mem;

		goto err_release_fb;

	}



	par->irq = platform_get_irq(device, 0);

	if (par->irq < 0) {

		ret = -ENOENT;

		goto err_release_pl_mem;

		goto err_release_fb;

	}



	da8xx_fb_var.grayscale =
@@ -1479,7 +1475,7 @@ static int fb_probe(struct platform_device *device) 


	ret = fb_alloc_cmap(&da8xx_fb_info->cmap, PALETTE_SIZE, 0);

	if (ret)

		goto err_release_pl_mem;

		goto err_release_fb;

	da8xx_fb_info->cmap.len = par->palette_sz;



	/* initialize var_screeninfo */
@@ -1533,14 +1529,6 @@ static int fb_probe(struct platform_device *device) 
err_dealloc_cmap:

	fb_dealloc_cmap(&da8xx_fb_info->cmap);



err_release_pl_mem:

	dma_free_coherent(par->dev, PALETTE_SIZE, par->v_palette_base,

			  par->p_palette_base);



err_release_fb_mem:

	dma_free_coherent(par->dev, par->vram_size, par->vram_virt,

		          par->vram_phys);



err_release_fb:

	framebuffer_release(da8xx_fb_info);