[ARM PATCH] 2462/1: IXP2000 - fixes for warnings from io.h

Patch from Ben Dooks

Fix the include/asm-arm/arch-ipx2000/io.h to remove the warnings
generated due to the IO addresses not being of the type `void __iomem *`

Signed-off-by: Ben Dooks
Signed-off-by: Russell King

diff --git a/include/asm-arm/arch-ixp2000/io.h b/include/asm-arm/arch-ixp2000/io.h
index 8e58f375289f1862c6f94dd3e6e53ed76ebb1434..d6971efbd583fc5c8007196f086d11e972d98bb2 100644 (file)
--- a/include/asm-arm/arch-ixp2000/io.h
+++ b/include/asm-arm/arch-ixp2000/io.h
@@ -21,14 +21,14 @@
 /*
  * Pick up VMALLOC_END
  */
-#define ___io(p)               ((unsigned long)((p)+IXP2000_PCI_IO_VIRT_BASE))
+#define ___io(p)               ((void __iomem *)((p)+IXP2000_PCI_IO_VIRT_BASE))
 
 /*
  * IXP2000 does not do proper byte-lane conversion for PCI addresses,
  * so we need to override standard functions.
  */
-#define alignb(addr)           ((addr & ~3) + (3 - (addr & 3)))
-#define alignw(addr)           ((addr & ~2) + (2 - (addr & 2)))
+#define alignb(addr)           (((unsigned long)addr & ~3) + (3 - ((unsigned long)addr & 3)))
+#define alignw(addr)           (((unsigned long)addr & ~2) + (2 - ((unsigned long)addr & 2)))
 
 #define outb(v,p)              __raw_writeb(v,alignb(___io(p)))
 #define outw(v,p)              __raw_writew((v),alignw(___io(p)))