[ARM PATCH] 2018/1: Fixed Patch 2017

Patch from Dave Jiang

Removed unnecessary parens in patch 2017 per RMK

diff --git a/include/asm-arm/memory.h b/include/asm-arm/memory.h
index 4902e9dbad5ebfba34cc5c9f9d6301b098e090fb..237862bf6568637c0fa74d535c06db5ac1f927be 100644 (file)
--- a/include/asm-arm/memory.h
+++ b/include/asm-arm/memory.h
@@ -185,9 +185,9 @@ static inline __deprecated void *bus_to_virt(unsigned long x)
  * We should really eliminate virt_to_bus() here - it's deprecated.
  */
 #ifndef __arch_page_to_dma
-#define page_to_dma(dev, page)         ((dma_addr_t)__virt_to_bus(page_address(page)))
+#define page_to_dma(dev, page)         ((dma_addr_t)__virt_to_bus((unsigned long)page_address(page)))
 #define dma_to_virt(dev, addr)         (__bus_to_virt(addr))
-#define virt_to_dma(dev, addr)         (__virt_to_bus(addr))
+#define virt_to_dma(dev, addr)         (__virt_to_bus((unsigned long)(addr)))
 #else
 #define page_to_dma(dev, page)         (__arch_page_to_dma(dev, page))
 #define dma_to_virt(dev, addr)         (__arch_dma_to_virt(dev, addr))