diff options
| author | Ben Dooks <ben-linux@org.rmk.(none)> | 2005-03-03 01:16:06 +0000 |
|---|---|---|
| committer | Russell King <rmk@flint.arm.linux.org.uk> | 2005-03-03 01:16:06 +0000 |
| commit | 5063dd9d9f91c42bdf7081fb85a808c06baad895 (patch) | |
| tree | dcca6a7ed25aa4217f7e98774948c251517c580d /include | |
| parent | 09674ad0b7fed330a9a83ce1cbc8b32e0c17e77d (diff) | |
[ARM PATCH] 2482/1: IXP2000 - header cleanup
Patch from Ben Dooks
fix the following problems:
lib/iomap.c:140: warning: passing arg 1 of `__raw_readsb' makes pointer from integer without a cast
lib/iomap.c:156: warning: passing arg 1 of `__raw_writesb' makes pointer from integer without a cast
include/asm-arm/arch-ixp2000/io.h modified to have (void __iomem *) in front of the alignment code
include/asm/arch/system.h:22: warning: `cli' is deprecated (declared at include/linux/interrupt.h:65)
cli() replace by local_irq_disable
arch/arm/mach-ixp2000/ixdp2x01.c:116: warning: passing arg 1 of `ixp2000_reg_write' from incompatible pointer type
arch/arm/mach-ixp2000/ixdp2x01.c:117: warning: passing arg 1 of `ixp2000_reg_write' from incompatible pointer type
fixed definition of the cpld registers IXDP2X01_CPLD_VIRT_REG()
Signed-off-by: Ben DooksLooks okay. Test-booted on ENP-2611, no problem.
Signed-off-by: Lennert Buytenhek <buytenh@wantstofly.org>
Signed-off-by: Russell King
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-arm/arch-ixp2000/io.h | 4 | ||||
| -rw-r--r-- | include/asm-arm/arch-ixp2000/ixdp2x01.h | 2 | ||||
| -rw-r--r-- | include/asm-arm/arch-ixp2000/system.h | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/include/asm-arm/arch-ixp2000/io.h b/include/asm-arm/arch-ixp2000/io.h index d6971efbd583..571dbbcd8521 100644 --- a/include/asm-arm/arch-ixp2000/io.h +++ b/include/asm-arm/arch-ixp2000/io.h @@ -27,8 +27,8 @@ * IXP2000 does not do proper byte-lane conversion for PCI addresses, * so we need to override standard functions. */ -#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 alignb(addr) (void __iomem *)(((unsigned long)addr & ~3) + (3 - ((unsigned long)addr & 3))) +#define alignw(addr) (void __iomem *)(((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))) diff --git a/include/asm-arm/arch-ixp2000/ixdp2x01.h b/include/asm-arm/arch-ixp2000/ixdp2x01.h index 46469c4d5ddc..24aa0b5ba6fa 100644 --- a/include/asm-arm/arch-ixp2000/ixdp2x01.h +++ b/include/asm-arm/arch-ixp2000/ixdp2x01.h @@ -21,7 +21,7 @@ #define IXDP2X01_VIRT_CPLD_BASE 0xfefdd000 #define IXDP2X01_CPLD_REGION_SIZE 0x1000 -#define IXDP2X01_CPLD_VIRT_REG(reg) (volatile u32*)(IXDP2X01_VIRT_CPLD_BASE | reg) +#define IXDP2X01_CPLD_VIRT_REG(reg) (volatile unsigned long*)(IXDP2X01_VIRT_CPLD_BASE | reg) #define IXDP2X01_CPLD_PHYS_REG(reg) (volatile u32*)(IXDP2X01_PHYS_CPLD_BASE | reg) #define IXDP2X01_UART1_VIRT_BASE IXDP2X01_CPLD_VIRT_REG(0x40) diff --git a/include/asm-arm/arch-ixp2000/system.h b/include/asm-arm/arch-ixp2000/system.h index f9eb8ad435fb..4f489cc0dfa5 100644 --- a/include/asm-arm/arch-ixp2000/system.h +++ b/include/asm-arm/arch-ixp2000/system.h @@ -19,7 +19,7 @@ static inline void arch_idle(void) static inline void arch_reset(char mode) { - cli(); + local_irq_disable(); /* * Reset flash banking register so that we are pointing at |