aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorRussell King <rmk@dyn-67.arm.linux.org.uk>2006-01-04 14:43:24 -0500
committerRussell King <rmk+kernel@arm.linux.org.uk>2006-01-04 14:43:24 -0500
commitea8874dc3881c2a496a4bd6bc981f707cc6a0db1 (patch)
treec7cef73da86e9ce36a7a8358fbf20b34db2f6d07 /drivers
parent45e24601921fc1c4ca7932f7f7a475d3ad64ecad (diff)
[SERIAL] Remove _INLINE_
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/serial/8250.c8
-rw-r--r--drivers/serial/8250.h6
2 files changed, 4 insertions, 10 deletions
diff --git a/drivers/serial/8250.c b/drivers/serial/8250.c
index 56dcfd93bdc4..1891cf5bdeef 100644
--- a/drivers/serial/8250.c
+++ b/drivers/serial/8250.c
@@ -296,7 +296,7 @@ static inline int map_8250_out_reg(struct uart_8250_port *up, int offset)
296 296
297#endif 297#endif
298 298
299static _INLINE_ unsigned int serial_in(struct uart_8250_port *up, int offset) 299static unsigned int serial_in(struct uart_8250_port *up, int offset)
300{ 300{
301 offset = map_8250_in_reg(up, offset) << up->port.regshift; 301 offset = map_8250_in_reg(up, offset) << up->port.regshift;
302 302
@@ -321,7 +321,7 @@ static _INLINE_ unsigned int serial_in(struct uart_8250_port *up, int offset)
321 } 321 }
322} 322}
323 323
324static _INLINE_ void 324static void
325serial_out(struct uart_8250_port *up, int offset, int value) 325serial_out(struct uart_8250_port *up, int offset, int value)
326{ 326{
327 offset = map_8250_out_reg(up, offset) << up->port.regshift; 327 offset = map_8250_out_reg(up, offset) << up->port.regshift;
@@ -1131,7 +1131,7 @@ static void serial8250_enable_ms(struct uart_port *port)
1131 serial_out(up, UART_IER, up->ier); 1131 serial_out(up, UART_IER, up->ier);
1132} 1132}
1133 1133
1134static _INLINE_ void 1134static void
1135receive_chars(struct uart_8250_port *up, int *status, struct pt_regs *regs) 1135receive_chars(struct uart_8250_port *up, int *status, struct pt_regs *regs)
1136{ 1136{
1137 struct tty_struct *tty = up->port.info->tty; 1137 struct tty_struct *tty = up->port.info->tty;
@@ -1217,7 +1217,7 @@ receive_chars(struct uart_8250_port *up, int *status, struct pt_regs *regs)
1217 *status = lsr; 1217 *status = lsr;
1218} 1218}
1219 1219
1220static _INLINE_ void transmit_chars(struct uart_8250_port *up) 1220static void transmit_chars(struct uart_8250_port *up)
1221{ 1221{
1222 struct circ_buf *xmit = &up->port.info->xmit; 1222 struct circ_buf *xmit = &up->port.info->xmit;
1223 int count; 1223 int count;
diff --git a/drivers/serial/8250.h b/drivers/serial/8250.h
index a607b98016db..490606b87095 100644
--- a/drivers/serial/8250.h
+++ b/drivers/serial/8250.h
@@ -51,12 +51,6 @@ struct serial8250_config {
51#define UART_BUG_TXEN (1 << 1) /* UART has buggy TX IIR status */ 51#define UART_BUG_TXEN (1 << 1) /* UART has buggy TX IIR status */
52#define UART_BUG_NOMSR (1 << 2) /* UART has buggy MSR status bits (Au1x00) */ 52#define UART_BUG_NOMSR (1 << 2) /* UART has buggy MSR status bits (Au1x00) */
53 53
54#if defined(__i386__) && (defined(CONFIG_M386) || defined(CONFIG_M486))
55#define _INLINE_ inline
56#else
57#define _INLINE_
58#endif
59
60#define PROBE_RSA (1 << 0) 54#define PROBE_RSA (1 << 0)
61#define PROBE_ANY (~0) 55#define PROBE_ANY (~0)
62 56