]> git.ipfire.org Git - people/ms/u-boot.git/commitdiff
ARM: bcm2835: fix 64-bit build warning in mbox
authorStephen Warren <swarren@wwwdotorg.org>
Thu, 17 Mar 2016 03:40:57 +0000 (21:40 -0600)
committerTom Rini <trini@konsulko.com>
Sun, 27 Mar 2016 13:12:20 +0000 (09:12 -0400)
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>
arch/arm/mach-bcm283x/mbox.c

index 311bd8feaab071fdb7ffdb23477ef8c68cdbcd23..ec3f417f40f4356669570245d1c4ecaefcaffb5d 100644 (file)
@@ -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;
        }