path: root/arch/arm/include
diff options
authorArnd Bergmann <arnd@arndb.de>2013-02-14 15:05:40 +0100
committerArnd Bergmann <arnd@arndb.de>2013-02-14 15:05:40 +0100
commit7822eee1acbbea254212ad69ac99aae7986461da (patch)
treed7168d2e23130e3e6c36a731edc29eadd5128fc2 /arch/arm/include
parent0e55f0b0037c91bf269f7975ad353c31d8d12c32 (diff)
parent8c0c774dd7b4aa0e0b69f483a70c7f41995139ef (diff)
Merge branch 'warning-fixes' into next/fixes-non-critical
These are fixes for compiler warnings that for the most part were introduced during the 3.8 cycle but are otherwise harmless. * warning-fixes: scripts/sortextable: silence script output ARM: s3c: i2c: add platform_device forward declaration ARM: mvebu: allow selecting mvebu without Armada XP ARM: pick Versatile by default for !MMU ARM: integrator: fix build with INTEGRATOR_AP off ARM: integrator/versatile: fix NOMMU warnings ARM: sa1100: don't warn about mach/ide.h ARM: shmobile: fix defconfig warning on CONFIG_USB ARM: w90x900: fix legacy assembly syntax ARM: samsung: fix assembly syntax for new gas ARM: disable virt_to_bus/virt_to_bus almost everywhere Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/include')
2 files changed, 3 insertions, 1 deletions
diff --git a/arch/arm/include/asm/dma.h b/arch/arm/include/asm/dma.h
index 5694a0d6576..58b8c6a0ab1 100644
--- a/arch/arm/include/asm/dma.h
+++ b/arch/arm/include/asm/dma.h
@@ -105,7 +105,7 @@ extern void set_dma_sg(unsigned int chan, struct scatterlist *sg, int nr_sg);
extern void __set_dma_addr(unsigned int chan, void *addr);
#define set_dma_addr(chan, addr) \
- __set_dma_addr(chan, bus_to_virt(addr))
+ __set_dma_addr(chan, (void *)__bus_to_virt(addr))
/* Set the DMA byte count for this channel
diff --git a/arch/arm/include/asm/memory.h b/arch/arm/include/asm/memory.h
index 73cf03aa981..b11105c8599 100644
--- a/arch/arm/include/asm/memory.h
+++ b/arch/arm/include/asm/memory.h
@@ -245,6 +245,7 @@ static inline void *phys_to_virt(phys_addr_t x)
#define __bus_to_pfn(x) __phys_to_pfn(x)
static inline __deprecated unsigned long virt_to_bus(void *x)
return __virt_to_bus((unsigned long)x);
@@ -254,6 +255,7 @@ static inline __deprecated void *bus_to_virt(unsigned long x)
return (void *)__bus_to_virt(x);
* Conversion between a struct page and a physical address.