Commit ef88ee4e authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Tomi Valkeinen

fbdev: da8xx-fb: remove incorrect type cast

The probe function correct passes a dma_addr_t pointer into
dma_alloc_coherent(), but has a cast to resource_size_t, which
might be different from dma_addr_t:

drivers/video/fbdev/da8xx-fb.c: In function 'fb_probe':
drivers/video/fbdev/da8xx-fb.c:1431:10: error: passing argument 3 of 'dma_alloc_coherent' from incompatible pointer type [-Werror=incompatible-pointer-types]

This removes the cast, which avoids the warning.
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarTomi Valkeinen <tomi.valkeinen@ti.com>
parent b54729b6
...@@ -152,7 +152,7 @@ static void lcdc_write(unsigned int val, unsigned int addr) ...@@ -152,7 +152,7 @@ static void lcdc_write(unsigned int val, unsigned int addr)
struct da8xx_fb_par { struct da8xx_fb_par {
struct device *dev; struct device *dev;
resource_size_t p_palette_base; dma_addr_t p_palette_base;
unsigned char *v_palette_base; unsigned char *v_palette_base;
dma_addr_t vram_phys; dma_addr_t vram_phys;
unsigned long vram_size; unsigned long vram_size;
...@@ -1428,7 +1428,7 @@ static int fb_probe(struct platform_device *device) ...@@ -1428,7 +1428,7 @@ static int fb_probe(struct platform_device *device)
par->vram_virt = dma_alloc_coherent(NULL, par->vram_virt = dma_alloc_coherent(NULL,
par->vram_size, par->vram_size,
(resource_size_t *) &par->vram_phys, &par->vram_phys,
GFP_KERNEL | GFP_DMA); GFP_KERNEL | GFP_DMA);
if (!par->vram_virt) { if (!par->vram_virt) {
dev_err(&device->dev, dev_err(&device->dev,
...@@ -1448,7 +1448,7 @@ static int fb_probe(struct platform_device *device) ...@@ -1448,7 +1448,7 @@ static int fb_probe(struct platform_device *device)
/* allocate palette buffer */ /* allocate palette buffer */
par->v_palette_base = dma_zalloc_coherent(NULL, PALETTE_SIZE, par->v_palette_base = dma_zalloc_coherent(NULL, PALETTE_SIZE,
(resource_size_t *)&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) {
dev_err(&device->dev, dev_err(&device->dev,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment