Skip to content

L
linux-davinci-2.6.23
Commit ea8874dc authored by Russell King's avatar Russell King Committed by Russell King
Browse files
Options

[SERIAL] Remove _INLINE_ 

Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 45e24601
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 10 deletions
drivers/serial/8250.c
View file @ ea8874dc
...@@ -296,7 +296,7 @@ static inline int map_8250_out_reg(struct uart_8250_port *up, int offset) ...@@ -296,7 +296,7 @@ static inline int map_8250_out_reg(struct uart_8250_port *up, int offset)
#endif #endif
static _INLINE_ unsigned int serial_in(struct uart_8250_port *up, int offset) static unsigned int serial_in(struct uart_8250_port *up, int offset)
{ {
offset = map_8250_in_reg(up, offset) << up->port.regshift; offset = map_8250_in_reg(up, offset) << up->port.regshift;
...@@ -321,7 +321,7 @@ static _INLINE_ unsigned int serial_in(struct uart_8250_port *up, int offset) ...@@ -321,7 +321,7 @@ static _INLINE_ unsigned int serial_in(struct uart_8250_port *up, int offset)
} }
} }
static _INLINE_ void static void
serial_out(struct uart_8250_port *up, int offset, int value) serial_out(struct uart_8250_port *up, int offset, int value)
{ {
offset = map_8250_out_reg(up, offset) << up->port.regshift; offset = map_8250_out_reg(up, offset) << up->port.regshift;
...@@ -1131,7 +1131,7 @@ static void serial8250_enable_ms(struct uart_port *port) ...@@ -1131,7 +1131,7 @@ static void serial8250_enable_ms(struct uart_port *port)
serial_out(up, UART_IER, up->ier); serial_out(up, UART_IER, up->ier);
} }
static _INLINE_ void static void
receive_chars(struct uart_8250_port *up, int *status, struct pt_regs *regs) receive_chars(struct uart_8250_port *up, int *status, struct pt_regs *regs)
{ {
struct tty_struct *tty = up->port.info->tty; 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,7 +1217,7 @@ receive_chars(struct uart_8250_port *up, int *status, struct pt_regs *regs)
*status = lsr; *status = lsr;
} }
static _INLINE_ void transmit_chars(struct uart_8250_port *up) static void transmit_chars(struct uart_8250_port *up)
{ {
struct circ_buf *xmit = &up->port.info->xmit; struct circ_buf *xmit = &up->port.info->xmit;
int count; int count;
......
drivers/serial/8250.h
View file @ ea8874dc
...@@ -51,12 +51,6 @@ struct serial8250_config { ...@@ -51,12 +51,6 @@ struct serial8250_config {
#define UART_BUG_TXEN (1 << 1) /* UART has buggy TX IIR status */ #define UART_BUG_TXEN (1 << 1) /* UART has buggy TX IIR status */
#define UART_BUG_NOMSR (1 << 2) /* UART has buggy MSR status bits (Au1x00) */ #define UART_BUG_NOMSR (1 << 2) /* UART has buggy MSR status bits (Au1x00) */
#if defined(__i386__) && (defined(CONFIG_M386) || defined(CONFIG_M486))
#define _INLINE_ inline
#else
#define _INLINE_
#endif
#define PROBE_RSA (1 << 0) #define PROBE_RSA (1 << 0)
#define PROBE_ANY (~0) #define PROBE_ANY (~0)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment