GitHub-Mirror/Star64_linux
2
0
Fork 0
mirror of https://github.com/Fishwaldo/Star64_linux.git synced 2025-06-06 14:48:06 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[PATCH] m32r: NONCACHE_OFFSET in _port2addr

Browse source 
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 <fujiwara@linux-m32r.org>
Signed-off-by: Hirokazu Takata <takata@linux-m32r.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Hirokazu Takata 2005-10-30 15:00:04 -08:00 • committed by Linus Torvalds
parent c978b0179b
commit 1343f776c5
5 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
arch/m32r/kernel/io_mappi.c
View file

@ -31,7 +31,7 @@ extern void pcc_iowrite(int, unsigned long, void *, size_t, size_t, int);
static inline void *_port2addr(unsigned long port) 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) static inline void *_port2addr_ne(unsigned long port)

2
arch/m32r/kernel/io_mappi2.c
View file

@ -33,7 +33,7 @@ extern void pcc_iowrite_word(int, unsigned long, void *, size_t, size_t, int);
static inline void *_port2addr(unsigned long port) static inline void *_port2addr(unsigned long port)
{ {
return (void *)(port + NONCACHE_OFFSET); return (void *)(port | (NONCACHE_OFFSET));
} }
#define LAN_IOSTART 0x300 #define LAN_IOSTART 0x300

2
arch/m32r/kernel/io_oaks32r.c
View file

@ -16,7 +16,7 @@
static inline void *_port2addr(unsigned long port) 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) static inline void *_port2addr_ne(unsigned long port)

2
arch/m32r/kernel/io_opsput.c
View file

@ -36,7 +36,7 @@ extern void pcc_iowrite_word(int, unsigned long, void *, size_t, size_t, int);
static inline void *_port2addr(unsigned long port) static inline void *_port2addr(unsigned long port)
{ {
return (void *)(port + NONCACHE_OFFSET); return (void *)(port | (NONCACHE_OFFSET));
} }
/* /*

2
arch/m32r/kernel/io_usrv.c
View file

@ -47,7 +47,7 @@ static inline void *_port2addr(unsigned long port)
else if (port >= UART1_IOSTART && port <= UART1_IOEND) else if (port >= UART1_IOSTART && port <= UART1_IOEND)
port = ((port - UART1_IOSTART) << 1) + UART1_REGSTART; port = ((port - UART1_IOSTART) << 1) + UART1_REGSTART;
#endif /* CONFIG_SERIAL_8250 || CONFIG_SERIAL_8250_MODULE */ #endif /* CONFIG_SERIAL_8250 || CONFIG_SERIAL_8250_MODULE */
return (void *)(port + NONCACHE_OFFSET); return (void *)(port | (NONCACHE_OFFSET));
} }
static inline void delay(void) static inline void delay(void)