1 files changed, 7 insertions, 7 deletions
diff --git a/arch/arm/mach-iop13xx/include/mach/memory.h b/arch/arm/mach-iop13xx/include/mach/memory.h
index 1afa99ef97fa..7c032d0ab24a 100644
--- a/arch/arm/mach-iop13xx/include/mach/memory.h
+++ b/arch/arm/mach-iop13xx/include/mach/memory.h
@@ -16,12 +16,12 @@
 #define IOP13XX_PMMR_P_START (IOP13XX_PMMR_PHYS_MEM_BASE)
 #define IOP13XX_PMMR_P_END   (IOP13XX_PMMR_PHYS_MEM_BASE + IOP13XX_PMMR_SIZE)
-static inline dma_addr_t __virt_to_lbus(unsigned long x)
+static inline dma_addr_t __virt_to_lbus(void __iomem *x)
 {
        return x + IOP13XX_PMMR_PHYS_MEM_BASE - IOP13XX_PMMR_VIRT_MEM_BASE;
 }
-static inline unsigned long __lbus_to_virt(dma_addr_t x)
+static inline void __iomem *__lbus_to_virt(dma_addr_t x)
 {
        return x + IOP13XX_PMMR_VIRT_MEM_BASE - IOP13XX_PMMR_PHYS_MEM_BASE;
 }
@@ -38,23 +38,23 @@ static inline unsigned long __lbus_to_virt(dma_addr_t x)
 #define __arch_dma_to_virt(dev, addr)                                   \
        ({                                                              \
-                unsigned long __virt;                                   \
+                void * __virt;                                          \
                dma_addr_t __dma = addr;                                \
                if (is_lbus_device(dev) && __is_lbus_dma(__dma))        \
                        __virt = __lbus_to_virt(__dma);                 \
                else                                                    \
-                        __virt = __phys_to_virt(__dma);                 \
+                        __virt = (void *)__phys_to_virt(__dma);         \
-                (void *)__virt;                                         \
+                __virt;                                                 \
        })
 #define __arch_virt_to_dma(dev, addr)                                   \
        ({                                                              \
-                unsigned long __virt = (unsigned long)addr;             \
+                void * __virt = addr;                                   \
                dma_addr_t __dma;                                       \
                if (is_lbus_device(dev) && __is_lbus_virt(__virt))      \
                        __dma = __virt_to_lbus(__virt);                 \
                else                                                    \
-                        __dma = __virt_to_phys(__virt);                 \
+                        __dma = __virt_to_phys((unsigned long)__virt);  \
                __dma;                                                  \
        })

diff --git a/arch/arm/mach-iop13xx/include/mach/memory.h b/arch/arm/mach-iop13xx/include/mach/memory.h index 1afa99ef97fa..7c032d0ab24a 100644 --- a/arch/arm/mach-iop13xx/include/mach/memory.h +++ b/arch/arm/mach-iop13xx/include/mach/memory.h
@@ -16,12 +16,12 @@
16	#define IOP13XX_PMMR_P_START (IOP13XX_PMMR_PHYS_MEM_BASE)	16	#define IOP13XX_PMMR_P_START (IOP13XX_PMMR_PHYS_MEM_BASE)
17	#define IOP13XX_PMMR_P_END (IOP13XX_PMMR_PHYS_MEM_BASE + IOP13XX_PMMR_SIZE)	17	#define IOP13XX_PMMR_P_END (IOP13XX_PMMR_PHYS_MEM_BASE + IOP13XX_PMMR_SIZE)
18		18
19	static inline dma_addr_t __virt_to_lbus(unsigned long x)	19	static inline dma_addr_t __virt_to_lbus(void __iomem *x)
20	{	20	{
21	return x + IOP13XX_PMMR_PHYS_MEM_BASE - IOP13XX_PMMR_VIRT_MEM_BASE;	21	return x + IOP13XX_PMMR_PHYS_MEM_BASE - IOP13XX_PMMR_VIRT_MEM_BASE;
22	}	22	}
23		23
24	static inline unsigned long __lbus_to_virt(dma_addr_t x)	24	static inline void __iomem *__lbus_to_virt(dma_addr_t x)
25	{	25	{
26	return x + IOP13XX_PMMR_VIRT_MEM_BASE - IOP13XX_PMMR_PHYS_MEM_BASE;	26	return x + IOP13XX_PMMR_VIRT_MEM_BASE - IOP13XX_PMMR_PHYS_MEM_BASE;
27	}	27	}
@@ -38,23 +38,23 @@ static inline unsigned long __lbus_to_virt(dma_addr_t x)
38		38
39	#define __arch_dma_to_virt(dev, addr) \	39	#define __arch_dma_to_virt(dev, addr) \
40	({ \	40	({ \
41	unsigned long __virt; \	41	void * __virt; \
42	dma_addr_t __dma = addr; \	42	dma_addr_t __dma = addr; \
43	if (is_lbus_device(dev) && __is_lbus_dma(__dma)) \	43	if (is_lbus_device(dev) && __is_lbus_dma(__dma)) \
44	__virt = __lbus_to_virt(__dma); \	44	__virt = __lbus_to_virt(__dma); \
45	else \	45	else \
46	__virt = __phys_to_virt(__dma); \	46	__virt = (void *)__phys_to_virt(__dma); \
47	(void *)__virt; \	47	__virt; \
48	})	48	})
49		49
50	#define __arch_virt_to_dma(dev, addr) \	50	#define __arch_virt_to_dma(dev, addr) \
51	({ \	51	({ \
52	unsigned long __virt = (unsigned long)addr; \	52	void * __virt = addr; \
53	dma_addr_t __dma; \	53	dma_addr_t __dma; \
54	if (is_lbus_device(dev) && __is_lbus_virt(__virt)) \	54	if (is_lbus_device(dev) && __is_lbus_virt(__virt)) \
55	__dma = __virt_to_lbus(__virt); \	55	__dma = __virt_to_lbus(__virt); \
56	else \	56	else \
57	__dma = __virt_to_phys(__virt); \	57	__dma = __virt_to_phys((unsigned long)__virt); \
58	__dma; \	58	__dma; \
59	})	59	})
60		60