diff options
author | Arnd Bergmann <arnd@arndb.de> | 2016-01-25 10:05:18 -0500 |
---|---|---|
committer | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2016-01-29 06:37:42 -0500 |
commit | ef88ee4e2c98c11dab56b2845ade9270acb8e68b (patch) | |
tree | 91322225e461a07e5ec6bb80735cd777e4478a7a | |
parent | b54729b6cea7d1f46b1ed70cb7065c6bdefaa780 (diff) |
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: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
-rw-r--r-- | drivers/video/fbdev/da8xx-fb.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/video/fbdev/da8xx-fb.c b/drivers/video/fbdev/da8xx-fb.c index 0081725c6b5b..6b2a06d09f2b 100644 --- a/drivers/video/fbdev/da8xx-fb.c +++ b/drivers/video/fbdev/da8xx-fb.c | |||
@@ -152,7 +152,7 @@ static void lcdc_write(unsigned int val, unsigned int addr) | |||
152 | 152 | ||
153 | struct da8xx_fb_par { | 153 | struct da8xx_fb_par { |
154 | struct device *dev; | 154 | struct device *dev; |
155 | resource_size_t p_palette_base; | 155 | dma_addr_t p_palette_base; |
156 | unsigned char *v_palette_base; | 156 | unsigned char *v_palette_base; |
157 | dma_addr_t vram_phys; | 157 | dma_addr_t vram_phys; |
158 | unsigned long vram_size; | 158 | unsigned long vram_size; |
@@ -1428,7 +1428,7 @@ static int fb_probe(struct platform_device *device) | |||
1428 | 1428 | ||
1429 | par->vram_virt = dma_alloc_coherent(NULL, | 1429 | par->vram_virt = dma_alloc_coherent(NULL, |
1430 | par->vram_size, | 1430 | par->vram_size, |
1431 | (resource_size_t *) &par->vram_phys, | 1431 | &par->vram_phys, |
1432 | GFP_KERNEL | GFP_DMA); | 1432 | GFP_KERNEL | GFP_DMA); |
1433 | if (!par->vram_virt) { | 1433 | if (!par->vram_virt) { |
1434 | dev_err(&device->dev, | 1434 | dev_err(&device->dev, |
@@ -1448,7 +1448,7 @@ static int fb_probe(struct platform_device *device) | |||
1448 | 1448 | ||
1449 | /* allocate palette buffer */ | 1449 | /* allocate palette buffer */ |
1450 | par->v_palette_base = dma_zalloc_coherent(NULL, PALETTE_SIZE, | 1450 | par->v_palette_base = dma_zalloc_coherent(NULL, PALETTE_SIZE, |
1451 | (resource_size_t *)&par->p_palette_base, | 1451 | &par->p_palette_base, |
1452 | GFP_KERNEL | GFP_DMA); | 1452 | GFP_KERNEL | GFP_DMA); |
1453 | if (!par->v_palette_base) { | 1453 | if (!par->v_palette_base) { |
1454 | dev_err(&device->dev, | 1454 | dev_err(&device->dev, |