kill _INLINE_
Subsystems (4)
RFC PATCH 1/1 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 <[email protected]>
---
arch/ia64/hp/sim/simserial.c | 7 -- arch/xtensa/platform-iss/console.c | 4 - drivers/char/amiserial.c | 18 ++----- drivers/isdn/hisax/config.c | 1 drivers/isdn/hisax/elsa.c | 1 drivers/serial/68328serial.c | 9 +-- drivers/serial/au1x00_uart.c | 11 ++-- drivers/serial/crisv10.c | 68 +++++++++-------------------- drivers/serial/m32r_sio.c | 15 ++---- drivers/serial/sunsu.c | 13 ++--- drivers/tc/zs.c | 9 +-- include/linux/tty_flip.h | 12 +---- 12 files changed, 56 insertions(+), 112 deletions(-)
include/linux/tty_flip.h renamed from include/linux/tty_flip.h.old +3 -9
@@ -7,14 +7,8 @@extern int tty_prepare_flip_string (struct tty_struct *tty,unsigned char **chars,size_t size);extern int tty_prepare_flip_string_flags (struct tty_struct *tty,unsigned char **chars,char **flags,size_t size); -#ifdef INCLUDE_INLINE_FUNCS -#define _INLINE_ extern -#else -#define _INLINE_ static __inline__ -#endif - -_INLINE_ int tty_insert_flip_char(struct tty_struct *tty, -unsigned char ch,char flag) +static inline int tty_insert_flip_char (struct tty_struct *tty, +unsigned char ch,char flag) {struct tty_buffer *tb = tty->buf.tail;if (tb && tb->used < tb->size) {
@@ -25,7 +19,7 @@return tty_insert_flip_string_flags (tty, &ch, &flag,1 ); } -_INLINE_ void tty_schedule_flip(struct tty_struct *tty) +static inline void tty_schedule_flip (struct tty_struct *tty) {schedule_delayed_work (&tty->buf.work,1 ); }
drivers/isdn/hisax/config.c renamed from drivers/isdn/hisax/config.c.old +0 -1
@@ -25,7 +25,6 @@#include <linux/workqueue.h> #include <linux/interrupt.h> #define HISAX_STATUS_BUFSIZE 4096 -#define INCLUDE_INLINE_FUNCS /* * This structure array contains one entry per card. An entry looks
arch/ia64/hp/sim/simserial.c renamed from arch/ia64/hp/sim/simserial.c.old +1 -6
@@ -46,11 +46,6 @@#define KEYBOARD_INTR 3/* must match with simulator! */ #define NR_PORTS 1/* only one port for now */ -#define SERIAL_INLINE 1 - -#ifdef SERIAL_INLINE -#define _INLINE_ inline -#endif #define IRQ_T (info) ((info->flags & ASYNC_SHARE_IRQ) ? SA_SHIRQ : SA_INTERRUPT)
@@ -244,7 +239,7 @@local_irq_restore (flags); } -static _INLINE_ void transmit_chars(struct async_struct *info, int *intr_done) +static void transmit_chars (struct async_struct *info,int *intr_done) {int count;unsigned long flags;
arch/xtensa/platform-iss/console.c renamed from arch/xtensa/platform-iss/console.c.old +0 -4
@@ -31,10 +31,6 @@#include <linux/tty.h> #include <linux/tty_flip.h> -#ifdef SERIAL_INLINE -#define _INLINE_ inline -#endif -#define SERIAL_MAX_NUM_LINES 1#define SERIAL_TIMER_VALUE (20 * HZ)
drivers/char/amiserial.c renamed from drivers/char/amiserial.c.old +6 -12
@@ -46,8 +46,6 @@/* Sanity checks */ -#define SERIAL_INLINE -#if defined(MODULE ) && defined(SERIAL_DEBUG_MCOUNT )#define DBG_CNT (s) printk("(%s): [%x] refc=%d, serc=%d, ttyc=%d -> %s\n", \ tty->name, (info->flags), serial_driver->refcount,info->count,tty->count,s)
@@ -95,10 +93,6 @@#include <asm/amigahw.h> #include <asm/amigaints.h> -#ifdef SERIAL_INLINE -#define _INLINE_ inline -#endif -#define custom amiga_customstatic char *serial_name ="Amiga-builtin serial driver" ;
@@ -254,14 +248,14 @@* 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 async_struct *info, -int event) +static void rs_sched_event (struct async_struct *info, +int event) { info->event |=1 << event;tasklet_schedule (&info->tlet); } -static _INLINE_ void receive_chars(struct async_struct *info) +static void receive_chars (struct async_struct *info) {int status;int serdatr;
@@ -350,7 +344,7 @@return ; } -static _INLINE_ void transmit_chars(struct async_struct *info) +static void transmit_chars (struct async_struct *info) { custom.intreq =IF_TBE ;mb ();
@@ -390,7 +384,7 @@ } } -static _INLINE_ void check_modem_status(struct async_struct *info) +static void check_modem_status (struct async_struct *info) {unsigned char status = ciab.pra & (SER_DCD |SER_CTS |SER_DSR );unsigned char dstatus;
@@ -1960,7 +1954,7 @@* number, and identifies which options were configured into this * driver. */ -static _INLINE_ void show_serial_version(void) +static void show_serial_version (void ) {printk (KERN_INFO "%s version %s\n" , serial_name, serial_version); }
drivers/isdn/hisax/elsa.c renamed from drivers/isdn/hisax/elsa.c.old +0 -1
@@ -108,7 +108,6 @@#define ELSA_ASSIGN 4#define RS_ISR_PASS_LIMIT 256 -#define _INLINE_ inline#define FLG_MODEM_ACTIVE 1/* IPAC AUX */ #define ELSA_IPAC_LINE_LED 0x40/* Bit 6 Gelbe LED */
drivers/serial/68328serial.c renamed from drivers/serial/68328serial.c.old +4 -5
@@ -101,8 +101,6 @@#define RS_ISR_PASS_LIMIT 256 -#define _INLINE_ inline -static void change_speed (struct m68k_serial *info);/*
@@ -263,7 +261,7 @@/* 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 ) {
@@ -290,7 +288,8 @@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];
@@ -360,7 +359,7 @@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];
drivers/serial/au1x00_uart.c renamed from drivers/serial/au1x00_uart.c.old +5 -6
@@ -133,13 +133,12 @@ { "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 @@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 @@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 @@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;
drivers/serial/crisv10.c renamed from drivers/serial/crisv10.c.old +22 -46
200 lines not on this page · raw message
drivers/serial/m32r_sio.c renamed from drivers/serial/m32r_sio.c.old +7 -8
@@ -248,17 +248,17 @@#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 @@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 @@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 @@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;
drivers/serial/sunsu.c renamed from drivers/serial/sunsu.c.old +5 -8
@@ -102,9 +102,7 @@#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_ 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 /*
@@ -319,7 +316,7 @@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;
@@ -398,7 +395,7 @@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;
@@ -434,7 +431,7 @@__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;
drivers/tc/zs.c renamed from drivers/tc/zs.c.old +3 -6
@@ -186,8 +186,6 @@#define RS_STROBE_TIME 10#define RS_ISR_PASS_LIMIT 256 -#define _INLINE_ inline -static void probe_sccs (void );static void change_speed (struct dec_serial *info);static void rs_wait_until_sent (struct tty_struct *tty,int timeout);
@@ -344,14 +342,13 @@* 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 dec_serial *info, int event) +static void rs_sched_event (struct dec_serial *info,int event) { info->event |=1 << event;tasklet_schedule (&info->tlet); } -static _INLINE_ void receive_chars(struct dec_serial *info, -struct pt_regs *regs) +static void receive_chars (struct dec_serial *info,struct pt_regs *regs) {struct tty_struct *tty = info->tty;unsigned char ch, stat, flag;
@@ -441,7 +438,7 @@rs_sched_event (info,RS_EVENT_WRITE_WAKEUP ); } -static _INLINE_ void status_handle(struct dec_serial *info) +static void status_handle (struct dec_serial *info) {unsigned char stat;