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

Commit 41c28ff1 authored by Adrian Bunk's avatar Adrian Bunk Committed by Linus Torvalds
Browse files

[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: default avatarAdrian Bunk <bunk@stusta.de>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 772a0dc5

arch/ia64/hp/sim/simserial.c

+1 −6
Original line number Diff line number Diff line
@@ -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)
@@ -237,7 +232,7 @@ static void rs_put_char(struct tty_struct *tty, unsigned char ch) 
	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

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

+6 −12
Original line number Diff line number Diff line
@@ -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 @@ static char *serial_version = "4.30"; 
#include <asm/amigahw.h>

#include <asm/amigaints.h>



#ifdef SERIAL_INLINE

#define _INLINE_ inline

#endif



#define custom amiga_custom

static char *serial_name = "Amiga-builtin serial driver";
@@ -253,14 +247,14 @@ static void 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 async_struct *info,

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;
@@ -349,7 +343,7 @@ static _INLINE_ void receive_chars(struct async_struct *info) 
	return;

}



static _INLINE_ void transmit_chars(struct async_struct *info)

static void transmit_chars(struct async_struct *info)

{

	custom.intreq = IF_TBE;

	mb();
@@ -389,7 +383,7 @@ static _INLINE_ void transmit_chars(struct async_struct *info) 
	}

}



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;
@@ -1959,7 +1953,7 @@ static int rs_read_proc(char *page, char **start, off_t off, int count, 
 * 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/config.c

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

drivers/isdn/hisax/elsa.c

+0 −1
Original line number Diff line number Diff line
@@ -108,7 +108,6 @@ static const char *ITACVer[] = 
#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 */