From: Hirokazu Takata Change _port2addr() not to add NONCACHE_OFFSET. Adding NONCACHE_OFFSET requires needless address adjusting by a driver using ioremap() like a SMC91x driver. Signed-off-by: Hayato Fujiwara Signed-off-by: Hirokazu Takata Signed-off-by: Andrew Morton --- arch/m32r/kernel/io_mappi.c | 2 +- arch/m32r/kernel/io_mappi2.c | 2 +- arch/m32r/kernel/io_oaks32r.c | 2 +- arch/m32r/kernel/io_opsput.c | 2 +- arch/m32r/kernel/io_usrv.c | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff -puN arch/m32r/kernel/io_mappi2.c~m32r-noncache_offset-in-_port2addr arch/m32r/kernel/io_mappi2.c --- devel/arch/m32r/kernel/io_mappi2.c~m32r-noncache_offset-in-_port2addr 2005-10-15 01:16:24.000000000 -0700 +++ devel-akpm/arch/m32r/kernel/io_mappi2.c 2005-10-15 01:16:24.000000000 -0700 @@ -33,7 +33,7 @@ extern void pcc_iowrite_word(int, unsign static inline void *_port2addr(unsigned long port) { - return (void *)(port + NONCACHE_OFFSET); + return (void *)(port | (NONCACHE_OFFSET)); } #define LAN_IOSTART 0x300 diff -puN arch/m32r/kernel/io_mappi.c~m32r-noncache_offset-in-_port2addr arch/m32r/kernel/io_mappi.c --- devel/arch/m32r/kernel/io_mappi.c~m32r-noncache_offset-in-_port2addr 2005-10-15 01:16:24.000000000 -0700 +++ devel-akpm/arch/m32r/kernel/io_mappi.c 2005-10-15 01:16:24.000000000 -0700 @@ -31,7 +31,7 @@ extern void pcc_iowrite(int, unsigned lo static inline void *_port2addr(unsigned long port) { - return (void *)(port + NONCACHE_OFFSET); + return (void *)(port | (NONCACHE_OFFSET)); } static inline void *_port2addr_ne(unsigned long port) diff -puN arch/m32r/kernel/io_oaks32r.c~m32r-noncache_offset-in-_port2addr arch/m32r/kernel/io_oaks32r.c --- devel/arch/m32r/kernel/io_oaks32r.c~m32r-noncache_offset-in-_port2addr 2005-10-15 01:16:24.000000000 -0700 +++ devel-akpm/arch/m32r/kernel/io_oaks32r.c 2005-10-15 01:16:24.000000000 -0700 @@ -16,7 +16,7 @@ static inline void *_port2addr(unsigned long port) { - return (void *)(port + NONCACHE_OFFSET); + return (void *)(port | (NONCACHE_OFFSET)); } static inline void *_port2addr_ne(unsigned long port) diff -puN arch/m32r/kernel/io_opsput.c~m32r-noncache_offset-in-_port2addr arch/m32r/kernel/io_opsput.c --- devel/arch/m32r/kernel/io_opsput.c~m32r-noncache_offset-in-_port2addr 2005-10-15 01:16:24.000000000 -0700 +++ devel-akpm/arch/m32r/kernel/io_opsput.c 2005-10-15 01:16:24.000000000 -0700 @@ -36,7 +36,7 @@ extern void pcc_iowrite_word(int, unsign static inline void *_port2addr(unsigned long port) { - return (void *)(port + NONCACHE_OFFSET); + return (void *)(port | (NONCACHE_OFFSET)); } /* diff -puN arch/m32r/kernel/io_usrv.c~m32r-noncache_offset-in-_port2addr arch/m32r/kernel/io_usrv.c --- devel/arch/m32r/kernel/io_usrv.c~m32r-noncache_offset-in-_port2addr 2005-10-15 01:16:24.000000000 -0700 +++ devel-akpm/arch/m32r/kernel/io_usrv.c 2005-10-15 01:16:24.000000000 -0700 @@ -47,7 +47,7 @@ static inline void *_port2addr(unsigned else if (port >= UART1_IOSTART && port <= UART1_IOEND) port = ((port - UART1_IOSTART) << 1) + UART1_REGSTART; #endif /* CONFIG_SERIAL_8250 || CONFIG_SERIAL_8250_MODULE */ - return (void *)(port + NONCACHE_OFFSET); + return (void *)(port | (NONCACHE_OFFSET)); } static inline void delay(void) _