Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1343f776 authored by Hirokazu Takata's avatar Hirokazu Takata Committed by Linus Torvalds
Browse files

[PATCH] m32r: NONCACHE_OFFSET in _port2addr 



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: default avatarHayato Fujiwara <fujiwara@linux-m32r.org>
Signed-off-by: default avatarHirokazu Takata <takata@linux-m32r.org>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent c978b017

arch/m32r/kernel/io_mappi.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -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)

arch/m32r/kernel/io_mappi2.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -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

arch/m32r/kernel/io_oaks32r.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -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)

arch/m32r/kernel/io_opsput.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -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));

}

}





/*

/*

arch/m32r/kernel/io_usrv.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -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)