2019-09-04 17:01:23 +00:00
|
|
|
From 5f8f06a43978ca3b976ce9188266e410c9a09edd Mon Sep 17 00:00:00 2001
|
2019-07-09 18:32:28 +00:00
|
|
|
From: Dave Stevenson <dave.stevenson@raspberrypi.org>
|
|
|
|
|
Date: Fri, 25 Jan 2019 17:11:39 +0000
|
2019-09-04 17:01:23 +00:00
|
|
|
Subject: [PATCH 330/782] video: bcm2708_fb: Fix warnings on 64 bit builds
|
2019-07-09 18:32:28 +00:00
|
|
|
|
|
|
|
|
Fix up logging lines where the wrong format specifiers were
|
|
|
|
|
being used.
|
|
|
|
|
|
|
|
|
|
Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
|
|
|
|
|
---
|
|
|
|
|
drivers/video/fbdev/bcm2708_fb.c | 10 ++++------
|
|
|
|
|
1 file changed, 4 insertions(+), 6 deletions(-)
|
|
|
|
|
|
|
|
|
|
--- a/drivers/video/fbdev/bcm2708_fb.c
|
|
|
|
|
+++ b/drivers/video/fbdev/bcm2708_fb.c
|
|
|
|
|
@@ -513,8 +513,8 @@ static long vc_mem_copy(struct bcm2708_f
|
|
|
|
|
buf = dma_alloc_coherent(fb->fb.device, PAGE_ALIGN(size), &bus_addr,
|
|
|
|
|
GFP_ATOMIC);
|
|
|
|
|
if (!buf) {
|
|
|
|
|
- pr_err("[%s]: failed to dma_alloc_coherent(%d)\n",
|
|
|
|
|
- __func__, size);
|
|
|
|
|
+ pr_err("[%s]: failed to dma_alloc_coherent(%zd)\n", __func__,
|
|
|
|
|
+ size);
|
|
|
|
|
rc = -ENOMEM;
|
|
|
|
|
goto out;
|
|
|
|
|
}
|
|
|
|
|
@@ -910,8 +910,7 @@ static int bcm2708_fb_probe(struct platf
|
|
|
|
|
goto free_fb;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
- pr_info("BCM2708FB: allocated DMA memory %08x\n",
|
|
|
|
|
- fb->cb_handle);
|
|
|
|
|
+ pr_info("BCM2708FB: allocated DMA memory %pad\n", &fb->cb_handle);
|
|
|
|
|
|
|
|
|
|
ret = bcm_dma_chan_alloc(BCM_DMA_FEATURE_BULK,
|
|
|
|
|
&fb->dma_chan_base, &fb->dma_irq);
|
|
|
|
|
@@ -929,8 +928,7 @@ static int bcm2708_fb_probe(struct platf
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
- pr_info("BCM2708FB: allocated DMA channel %d @ %p\n",
|
|
|
|
|
- fb->dma_chan, fb->dma_chan_base);
|
|
|
|
|
+ pr_info("BCM2708FB: allocated DMA channel %d\n", fb->dma_chan);
|
|
|
|
|
|
|
|
|
|
fb->dev = dev;
|
|
|
|
|
fb->fb.device = &dev->dev;
|
