[PATCH] kill _INLINE_
This patch removes all occurances of _INLINE_ in the kernel. With the exception of tty_flip.h, I've simply removed the inline's since gcc should know best which functions to be inlined. Signed-off-by: Adrian Bunk <bunk@stusta.de> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Adrian Bunk
committed by
Linus Torvalds
Linus Torvalds
parent
772a0dc5d2
commit
41c28ff163
@@ -101,8 +101,6 @@ struct tty_driver *serial_driver;
|
||||
|
||||
#define RS_ISR_PASS_LIMIT 256
|
||||
|
||||
#define _INLINE_ inline
|
||||
|
||||
static void change_speed(struct m68k_serial *info);
|
||||
|
||||
/*
|
||||
@@ -262,7 +260,7 @@ static void batten_down_hatches(void)
|
||||
/* Drop into the debugger */
|
||||
}
|
||||
|
||||
static _INLINE_ void status_handle(struct m68k_serial *info, unsigned short status)
|
||||
static void status_handle(struct m68k_serial *info, unsigned short status)
|
||||
{
|
||||
#if 0
|
||||
if(status & DCD) {
|
||||
@@ -289,7 +287,8 @@ static _INLINE_ void status_handle(struct m68k_serial *info, unsigned short stat
|
||||
return;
|
||||
}
|
||||
|
||||
static _INLINE_ void receive_chars(struct m68k_serial *info, struct pt_regs *regs, unsigned short rx)
|
||||
static void receive_chars(struct m68k_serial *info, struct pt_regs *regs,
|
||||
unsigned short rx)
|
||||
{
|
||||
struct tty_struct *tty = info->tty;
|
||||
m68328_uart *uart = &uart_addr[info->line];
|
||||
@@ -359,7 +358,7 @@ clear_and_exit:
|
||||
return;
|
||||
}
|
||||
|
||||
static _INLINE_ void transmit_chars(struct m68k_serial *info)
|
||||
static void transmit_chars(struct m68k_serial *info)
|
||||
{
|
||||
m68328_uart *uart = &uart_addr[info->line];
|
||||
|
||||
|
||||
@@ -133,13 +133,12 @@ static const struct serial_uart_config uart_config[PORT_MAX_8250+1] = {
|
||||
{ "AU1X00_UART",16, UART_CLEAR_FIFO | UART_USE_FIFO },
|
||||
};
|
||||
|
||||
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)
|
||||
{
|
||||
return au_readl((unsigned long)up->port.membase + offset);
|
||||
}
|
||||
|
||||
static _INLINE_ void
|
||||
serial_out(struct uart_8250_port *up, int offset, int value)
|
||||
static void serial_out(struct uart_8250_port *up, int offset, int value)
|
||||
{
|
||||
au_writel(value, (unsigned long)up->port.membase + offset);
|
||||
}
|
||||
@@ -237,7 +236,7 @@ static void serial8250_enable_ms(struct uart_port *port)
|
||||
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)
|
||||
{
|
||||
struct tty_struct *tty = up->port.info->tty;
|
||||
@@ -312,7 +311,7 @@ receive_chars(struct uart_8250_port *up, int *status, struct pt_regs *regs)
|
||||
spin_lock(&up->port.lock);
|
||||
}
|
||||
|
||||
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;
|
||||
int count;
|
||||
@@ -346,7 +345,7 @@ static _INLINE_ void transmit_chars(struct uart_8250_port *up)
|
||||
serial8250_stop_tx(&up->port);
|
||||
}
|
||||
|
||||
static _INLINE_ void check_modem_status(struct uart_8250_port *up)
|
||||
static void check_modem_status(struct uart_8250_port *up)
|
||||
{
|
||||
int status;
|
||||
|
||||
|
||||
@@ -481,8 +481,6 @@ static char *serial_version = "$Revision: 1.25 $";
|
||||
#include "serial_compat.h"
|
||||
#endif
|
||||
|
||||
#define _INLINE_ inline
|
||||
|
||||
struct tty_driver *serial_driver;
|
||||
|
||||
/* serial subtype definitions */
|
||||
@@ -591,8 +589,6 @@ static void rs_throttle(struct tty_struct * tty);
|
||||
static void rs_wait_until_sent(struct tty_struct *tty, int timeout);
|
||||
static int rs_write(struct tty_struct * tty, int from_user,
|
||||
const unsigned char *buf, int count);
|
||||
extern _INLINE_ int rs_raw_write(struct tty_struct * tty, int from_user,
|
||||
const unsigned char *buf, int count);
|
||||
#ifdef CONFIG_ETRAX_RS485
|
||||
static int e100_write_rs485(struct tty_struct * tty, int from_user,
|
||||
const unsigned char *buf, int count);
|
||||
@@ -1538,8 +1534,7 @@ e100_enable_rxdma_irq(struct e100_serial *info)
|
||||
|
||||
/* the tx DMA uses only dma_descr interrupt */
|
||||
|
||||
static _INLINE_ void
|
||||
e100_disable_txdma_irq(struct e100_serial *info)
|
||||
static void e100_disable_txdma_irq(struct e100_serial *info)
|
||||
{
|
||||
#ifdef SERIAL_DEBUG_INTR
|
||||
printk("txdma_irq(%d): 0\n",info->line);
|
||||
@@ -1548,8 +1543,7 @@ e100_disable_txdma_irq(struct e100_serial *info)
|
||||
*R_IRQ_MASK2_CLR = info->irq;
|
||||
}
|
||||
|
||||
static _INLINE_ void
|
||||
e100_enable_txdma_irq(struct e100_serial *info)
|
||||
static void e100_enable_txdma_irq(struct e100_serial *info)
|
||||
{
|
||||
#ifdef SERIAL_DEBUG_INTR
|
||||
printk("txdma_irq(%d): 1\n",info->line);
|
||||
@@ -1558,8 +1552,7 @@ e100_enable_txdma_irq(struct e100_serial *info)
|
||||
*R_IRQ_MASK2_SET = info->irq;
|
||||
}
|
||||
|
||||
static _INLINE_ void
|
||||
e100_disable_txdma_channel(struct e100_serial *info)
|
||||
static void e100_disable_txdma_channel(struct e100_serial *info)
|
||||
{
|
||||
unsigned long flags;
|
||||
|
||||
@@ -1599,8 +1592,7 @@ e100_disable_txdma_channel(struct e100_serial *info)
|
||||
}
|
||||
|
||||
|
||||
static _INLINE_ void
|
||||
e100_enable_txdma_channel(struct e100_serial *info)
|
||||
static void e100_enable_txdma_channel(struct e100_serial *info)
|
||||
{
|
||||
unsigned long flags;
|
||||
|
||||
@@ -1625,8 +1617,7 @@ e100_enable_txdma_channel(struct e100_serial *info)
|
||||
restore_flags(flags);
|
||||
}
|
||||
|
||||
static _INLINE_ void
|
||||
e100_disable_rxdma_channel(struct e100_serial *info)
|
||||
static void e100_disable_rxdma_channel(struct e100_serial *info)
|
||||
{
|
||||
unsigned long flags;
|
||||
|
||||
@@ -1665,8 +1656,7 @@ e100_disable_rxdma_channel(struct e100_serial *info)
|
||||
}
|
||||
|
||||
|
||||
static _INLINE_ void
|
||||
e100_enable_rxdma_channel(struct e100_serial *info)
|
||||
static void e100_enable_rxdma_channel(struct e100_serial *info)
|
||||
{
|
||||
unsigned long flags;
|
||||
|
||||
@@ -1913,9 +1903,7 @@ rs_start(struct tty_struct *tty)
|
||||
* This routine is used by the interrupt handler to schedule
|
||||
* processing in the software interrupt portion of the driver.
|
||||
*/
|
||||
static _INLINE_ void
|
||||
rs_sched_event(struct e100_serial *info,
|
||||
int event)
|
||||
static void rs_sched_event(struct e100_serial *info, int event)
|
||||
{
|
||||
if (info->event & (1 << event))
|
||||
return;
|
||||
@@ -2155,8 +2143,9 @@ add_char_and_flag(struct e100_serial *info, unsigned char data, unsigned char fl
|
||||
return 1;
|
||||
}
|
||||
|
||||
extern _INLINE_ unsigned int
|
||||
handle_descr_data(struct e100_serial *info, struct etrax_dma_descr *descr, unsigned int recvl)
|
||||
static unsigned int handle_descr_data(struct e100_serial *info,
|
||||
struct etrax_dma_descr *descr,
|
||||
unsigned int recvl)
|
||||
{
|
||||
struct etrax_recv_buffer *buffer = phys_to_virt(descr->buf) - sizeof *buffer;
|
||||
|
||||
@@ -2182,8 +2171,7 @@ handle_descr_data(struct e100_serial *info, struct etrax_dma_descr *descr, unsig
|
||||
return recvl;
|
||||
}
|
||||
|
||||
static _INLINE_ unsigned int
|
||||
handle_all_descr_data(struct e100_serial *info)
|
||||
static unsigned int handle_all_descr_data(struct e100_serial *info)
|
||||
{
|
||||
struct etrax_dma_descr *descr;
|
||||
unsigned int recvl;
|
||||
@@ -2230,8 +2218,7 @@ handle_all_descr_data(struct e100_serial *info)
|
||||
return ret;
|
||||
}
|
||||
|
||||
static _INLINE_ void
|
||||
receive_chars_dma(struct e100_serial *info)
|
||||
static void receive_chars_dma(struct e100_serial *info)
|
||||
{
|
||||
struct tty_struct *tty;
|
||||
unsigned char rstat;
|
||||
@@ -2292,8 +2279,7 @@ receive_chars_dma(struct e100_serial *info)
|
||||
*info->icmdadr = IO_STATE(R_DMA_CH6_CMD, cmd, restart);
|
||||
}
|
||||
|
||||
static _INLINE_ int
|
||||
start_recv_dma(struct e100_serial *info)
|
||||
static int start_recv_dma(struct e100_serial *info)
|
||||
{
|
||||
struct etrax_dma_descr *descr = info->rec_descr;
|
||||
struct etrax_recv_buffer *buffer;
|
||||
@@ -2348,11 +2334,6 @@ start_receive(struct e100_serial *info)
|
||||
}
|
||||
|
||||
|
||||
static _INLINE_ void
|
||||
status_handle(struct e100_serial *info, unsigned short status)
|
||||
{
|
||||
}
|
||||
|
||||
/* the bits in the MASK2 register are laid out like this:
|
||||
DMAI_EOP DMAI_DESCR DMAO_EOP DMAO_DESCR
|
||||
where I is the input channel and O is the output channel for the port.
|
||||
@@ -2454,8 +2435,7 @@ rec_interrupt(int irq, void *dev_id, struct pt_regs * regs)
|
||||
return IRQ_RETVAL(handled);
|
||||
} /* rec_interrupt */
|
||||
|
||||
static _INLINE_ int
|
||||
force_eop_if_needed(struct e100_serial *info)
|
||||
static int force_eop_if_needed(struct e100_serial *info)
|
||||
{
|
||||
/* We check data_avail bit to determine if data has
|
||||
* arrived since last time
|
||||
@@ -2499,8 +2479,7 @@ force_eop_if_needed(struct e100_serial *info)
|
||||
return 1;
|
||||
}
|
||||
|
||||
extern _INLINE_ void
|
||||
flush_to_flip_buffer(struct e100_serial *info)
|
||||
static void flush_to_flip_buffer(struct e100_serial *info)
|
||||
{
|
||||
struct tty_struct *tty;
|
||||
struct etrax_recv_buffer *buffer;
|
||||
@@ -2611,8 +2590,7 @@ flush_to_flip_buffer(struct e100_serial *info)
|
||||
tty_flip_buffer_push(tty);
|
||||
}
|
||||
|
||||
static _INLINE_ void
|
||||
check_flush_timeout(struct e100_serial *info)
|
||||
static void check_flush_timeout(struct e100_serial *info)
|
||||
{
|
||||
/* Flip what we've got (if we can) */
|
||||
flush_to_flip_buffer(info);
|
||||
@@ -2741,7 +2719,7 @@ TODO: The break will be delayed until an F or V character is received.
|
||||
|
||||
*/
|
||||
|
||||
extern _INLINE_
|
||||
static
|
||||
struct e100_serial * handle_ser_rx_interrupt_no_dma(struct e100_serial *info)
|
||||
{
|
||||
unsigned long data_read;
|
||||
@@ -2875,8 +2853,7 @@ more_data:
|
||||
return info;
|
||||
}
|
||||
|
||||
extern _INLINE_
|
||||
struct e100_serial* handle_ser_rx_interrupt(struct e100_serial *info)
|
||||
static struct e100_serial* handle_ser_rx_interrupt(struct e100_serial *info)
|
||||
{
|
||||
unsigned char rstat;
|
||||
|
||||
@@ -2995,7 +2972,7 @@ struct e100_serial* handle_ser_rx_interrupt(struct e100_serial *info)
|
||||
return info;
|
||||
} /* handle_ser_rx_interrupt */
|
||||
|
||||
extern _INLINE_ void handle_ser_tx_interrupt(struct e100_serial *info)
|
||||
static void handle_ser_tx_interrupt(struct e100_serial *info)
|
||||
{
|
||||
unsigned long flags;
|
||||
|
||||
@@ -3621,9 +3598,8 @@ rs_flush_chars(struct tty_struct *tty)
|
||||
restore_flags(flags);
|
||||
}
|
||||
|
||||
extern _INLINE_ int
|
||||
rs_raw_write(struct tty_struct * tty, int from_user,
|
||||
const unsigned char *buf, int count)
|
||||
static int rs_raw_write(struct tty_struct * tty, int from_user,
|
||||
const unsigned char *buf, int count)
|
||||
{
|
||||
int c, ret = 0;
|
||||
struct e100_serial *info = (struct e100_serial *)tty->driver_data;
|
||||
@@ -4710,7 +4686,7 @@ rs_open(struct tty_struct *tty, struct file * filp)
|
||||
* /proc fs routines....
|
||||
*/
|
||||
|
||||
extern _INLINE_ int line_info(char *buf, struct e100_serial *info)
|
||||
static int line_info(char *buf, struct e100_serial *info)
|
||||
{
|
||||
char stat_buf[30];
|
||||
int ret;
|
||||
|
||||
@@ -248,17 +248,17 @@ static void sio_error(int *status)
|
||||
|
||||
#endif /* CONFIG_SERIAL_M32R_PLDSIO */
|
||||
|
||||
static _INLINE_ unsigned int sio_in(struct uart_sio_port *up, int offset)
|
||||
static unsigned int sio_in(struct uart_sio_port *up, int offset)
|
||||
{
|
||||
return __sio_in(up->port.iobase + offset);
|
||||
}
|
||||
|
||||
static _INLINE_ void sio_out(struct uart_sio_port *up, int offset, int value)
|
||||
static void sio_out(struct uart_sio_port *up, int offset, int value)
|
||||
{
|
||||
__sio_out(value, up->port.iobase + offset);
|
||||
}
|
||||
|
||||
static _INLINE_ unsigned int serial_in(struct uart_sio_port *up, int offset)
|
||||
static unsigned int serial_in(struct uart_sio_port *up, int offset)
|
||||
{
|
||||
if (!offset)
|
||||
return 0;
|
||||
@@ -266,8 +266,7 @@ static _INLINE_ unsigned int serial_in(struct uart_sio_port *up, int offset)
|
||||
return __sio_in(offset);
|
||||
}
|
||||
|
||||
static _INLINE_ void
|
||||
serial_out(struct uart_sio_port *up, int offset, int value)
|
||||
static void serial_out(struct uart_sio_port *up, int offset, int value)
|
||||
{
|
||||
if (!offset)
|
||||
return;
|
||||
@@ -326,8 +325,8 @@ static void m32r_sio_enable_ms(struct uart_port *port)
|
||||
serial_out(up, UART_IER, up->ier);
|
||||
}
|
||||
|
||||
static _INLINE_ void receive_chars(struct uart_sio_port *up, int *status,
|
||||
struct pt_regs *regs)
|
||||
static void receive_chars(struct uart_sio_port *up, int *status,
|
||||
struct pt_regs *regs)
|
||||
{
|
||||
struct tty_struct *tty = up->port.info->tty;
|
||||
unsigned char ch;
|
||||
@@ -400,7 +399,7 @@ static _INLINE_ void receive_chars(struct uart_sio_port *up, int *status,
|
||||
tty_flip_buffer_push(tty);
|
||||
}
|
||||
|
||||
static _INLINE_ void transmit_chars(struct uart_sio_port *up)
|
||||
static void transmit_chars(struct uart_sio_port *up)
|
||||
{
|
||||
struct circ_buf *xmit = &up->port.info->xmit;
|
||||
int count;
|
||||
|
||||
@@ -102,9 +102,7 @@ struct uart_sunsu_port {
|
||||
#endif
|
||||
};
|
||||
|
||||
#define _INLINE_
|
||||
|
||||
static _INLINE_ unsigned int serial_in(struct uart_sunsu_port *up, int offset)
|
||||
static unsigned int serial_in(struct uart_sunsu_port *up, int offset)
|
||||
{
|
||||
offset <<= up->port.regshift;
|
||||
|
||||
@@ -121,8 +119,7 @@ static _INLINE_ unsigned int serial_in(struct uart_sunsu_port *up, int offset)
|
||||
}
|
||||
}
|
||||
|
||||
static _INLINE_ void
|
||||
serial_out(struct uart_sunsu_port *up, int offset, int value)
|
||||
static void serial_out(struct uart_sunsu_port *up, int offset, int value)
|
||||
{
|
||||
#ifndef CONFIG_SPARC64
|
||||
/*
|
||||
@@ -316,7 +313,7 @@ static void sunsu_enable_ms(struct uart_port *port)
|
||||
spin_unlock_irqrestore(&up->port.lock, flags);
|
||||
}
|
||||
|
||||
static _INLINE_ struct tty_struct *
|
||||
static struct tty_struct *
|
||||
receive_chars(struct uart_sunsu_port *up, unsigned char *status, struct pt_regs *regs)
|
||||
{
|
||||
struct tty_struct *tty = up->port.info->tty;
|
||||
@@ -395,7 +392,7 @@ receive_chars(struct uart_sunsu_port *up, unsigned char *status, struct pt_regs
|
||||
return tty;
|
||||
}
|
||||
|
||||
static _INLINE_ void transmit_chars(struct uart_sunsu_port *up)
|
||||
static void transmit_chars(struct uart_sunsu_port *up)
|
||||
{
|
||||
struct circ_buf *xmit = &up->port.info->xmit;
|
||||
int count;
|
||||
@@ -431,7 +428,7 @@ static _INLINE_ void transmit_chars(struct uart_sunsu_port *up)
|
||||
__stop_tx(up);
|
||||
}
|
||||
|
||||
static _INLINE_ void check_modem_status(struct uart_sunsu_port *up)
|
||||
static void check_modem_status(struct uart_sunsu_port *up)
|
||||
{
|
||||
int status;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user