diff mbox

[U-Boot,2/2] ARM: bcm2835: fix 64-bit build warning in mbox

Message ID 1458186057-30980-2-git-send-email-swarren@wwwdotorg.org
State Accepted
Commit 2b513158946b342a98f14671fd3a84827510a20f
Delegated to: Tom Rini
Headers show

Commit Message

Stephen Warren March 17, 2016, 3:40 a.m. UTC
Fixes:
arch/arm/mach-bcm283x/mbox.c: In function ‘bcm2835_mbox_call_prop’:
arch/arm/mach-bcm283x/mbox.c:118:48: warning: cast from pointer to integer of different size [-Wpointer-to-int-cast]
arch/arm/mach-bcm283x/mbox.c:126:29: warning: cast from pointer to integer of different size [-Wpointer-to-int-cast]

Signed-off-by: Stephen Warren <swarren@wwwdotorg.org>
---
 arch/arm/mach-bcm283x/mbox.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

Comments

Tom Rini March 17, 2016, 3:54 p.m. UTC | #1
On Wed, Mar 16, 2016 at 09:40:57PM -0600, Stephen Warren wrote:

> Fixes:
> arch/arm/mach-bcm283x/mbox.c: In function ‘bcm2835_mbox_call_prop’:
> arch/arm/mach-bcm283x/mbox.c:118:48: warning: cast from pointer to integer of different size [-Wpointer-to-int-cast]
> arch/arm/mach-bcm283x/mbox.c:126:29: warning: cast from pointer to integer of different size [-Wpointer-to-int-cast]
> 
> Signed-off-by: Stephen Warren <swarren@wwwdotorg.org>

Reviewed-by: Tom Rini <trini@konsulko.com>
Tom Rini March 27, 2016, 10:25 p.m. UTC | #2
On Wed, Mar 16, 2016 at 09:40:57PM -0600, Stephen Warren wrote:

> Fixes:
> arch/arm/mach-bcm283x/mbox.c: In function ‘bcm2835_mbox_call_prop’:
> arch/arm/mach-bcm283x/mbox.c:118:48: warning: cast from pointer to integer of different size [-Wpointer-to-int-cast]
> arch/arm/mach-bcm283x/mbox.c:126:29: warning: cast from pointer to integer of different size [-Wpointer-to-int-cast]
> 
> Signed-off-by: Stephen Warren <swarren@wwwdotorg.org>
> Reviewed-by: Tom Rini <trini@konsulko.com>

Applied to u-boot/master, thanks!
diff mbox

Patch

diff --git a/arch/arm/mach-bcm283x/mbox.c b/arch/arm/mach-bcm283x/mbox.c
index 311bd8feaab0..ec3f417f40f4 100644
--- a/arch/arm/mach-bcm283x/mbox.c
+++ b/arch/arm/mach-bcm283x/mbox.c
@@ -115,7 +115,9 @@  int bcm2835_mbox_call_prop(u32 chan, struct bcm2835_mbox_hdr *buffer)
 			   (unsigned long)((void *)buffer +
 			   roundup(buffer->buf_size, ARCH_DMA_MINALIGN)));
 
-	ret = bcm2835_mbox_call_raw(chan, phys_to_bus((u32)buffer), &rbuffer);
+	ret = bcm2835_mbox_call_raw(chan,
+				    phys_to_bus((unsigned long)buffer),
+				    &rbuffer);
 	if (ret)
 		return ret;
 
@@ -123,7 +125,7 @@  int bcm2835_mbox_call_prop(u32 chan, struct bcm2835_mbox_hdr *buffer)
 				(unsigned long)((void *)buffer +
 				roundup(buffer->buf_size, ARCH_DMA_MINALIGN)));
 
-	if (rbuffer != phys_to_bus((u32)buffer)) {
+	if (rbuffer != phys_to_bus((unsigned long)buffer)) {
 		printf("mbox: Response buffer mismatch\n");
 		return -1;
 	}