diff options
| -rw-r--r-- | arch/ia64/hp/sim/simserial.c | 7 | ||||
| -rw-r--r-- | arch/xtensa/platform-iss/console.c | 4 | ||||
| -rw-r--r-- | drivers/char/amiserial.c | 18 | ||||
| -rw-r--r-- | drivers/isdn/hisax/config.c | 1 | ||||
| -rw-r--r-- | drivers/isdn/hisax/elsa.c | 1 | ||||
| -rw-r--r-- | drivers/serial/68328serial.c | 9 | ||||
| -rw-r--r-- | drivers/serial/au1x00_uart.c | 11 | ||||
| -rw-r--r-- | drivers/serial/crisv10.c | 68 | ||||
| -rw-r--r-- | drivers/serial/m32r_sio.c | 15 | ||||
| -rw-r--r-- | drivers/serial/sunsu.c | 13 | ||||
| -rw-r--r-- | drivers/tc/zs.c | 9 | ||||
| -rw-r--r-- | include/linux/tty_flip.h | 12 | 
12 files changed, 56 insertions, 112 deletions
| diff --git a/arch/ia64/hp/sim/simserial.c b/arch/ia64/hp/sim/simserial.c index 626cdc83668b..0e5c6ae50228 100644 --- a/arch/ia64/hp/sim/simserial.c +++ b/arch/ia64/hp/sim/simserial.c | |||
| @@ -46,11 +46,6 @@ | |||
| 46 | #define KEYBOARD_INTR 3 /* must match with simulator! */ | 46 | #define KEYBOARD_INTR 3 /* must match with simulator! */ | 
| 47 | 47 | ||
| 48 | #define NR_PORTS 1 /* only one port for now */ | 48 | #define NR_PORTS 1 /* only one port for now */ | 
| 49 | #define SERIAL_INLINE 1 | ||
| 50 | |||
| 51 | #ifdef SERIAL_INLINE | ||
| 52 | #define _INLINE_ inline | ||
| 53 | #endif | ||
| 54 | 49 | ||
| 55 | #define IRQ_T(info) ((info->flags & ASYNC_SHARE_IRQ) ? SA_SHIRQ : SA_INTERRUPT) | 50 | #define IRQ_T(info) ((info->flags & ASYNC_SHARE_IRQ) ? SA_SHIRQ : SA_INTERRUPT) | 
| 56 | 51 | ||
| @@ -237,7 +232,7 @@ static void rs_put_char(struct tty_struct *tty, unsigned char ch) | |||
| 237 | local_irq_restore(flags); | 232 | local_irq_restore(flags); | 
| 238 | } | 233 | } | 
| 239 | 234 | ||
| 240 | static _INLINE_ void transmit_chars(struct async_struct *info, int *intr_done) | 235 | static void transmit_chars(struct async_struct *info, int *intr_done) | 
| 241 | { | 236 | { | 
| 242 | int count; | 237 | int count; | 
| 243 | unsigned long flags; | 238 | unsigned long flags; | 
| diff --git a/arch/xtensa/platform-iss/console.c b/arch/xtensa/platform-iss/console.c index 94fdfe474ac1..2a580efb58ec 100644 --- a/arch/xtensa/platform-iss/console.c +++ b/arch/xtensa/platform-iss/console.c | |||
| @@ -31,10 +31,6 @@ | |||
| 31 | #include <linux/tty.h> | 31 | #include <linux/tty.h> | 
| 32 | #include <linux/tty_flip.h> | 32 | #include <linux/tty_flip.h> | 
| 33 | 33 | ||
| 34 | #ifdef SERIAL_INLINE | ||
| 35 | #define _INLINE_ inline | ||
| 36 | #endif | ||
| 37 | |||
| 38 | #define SERIAL_MAX_NUM_LINES 1 | 34 | #define SERIAL_MAX_NUM_LINES 1 | 
| 39 | #define SERIAL_TIMER_VALUE (20 * HZ) | 35 | #define SERIAL_TIMER_VALUE (20 * HZ) | 
| 40 | 36 | ||
| diff --git a/drivers/char/amiserial.c b/drivers/char/amiserial.c index 7ac365b5d9ec..6602b3156df5 100644 --- a/drivers/char/amiserial.c +++ b/drivers/char/amiserial.c | |||
| @@ -46,8 +46,6 @@ | |||
| 46 | 46 | ||
| 47 | /* Sanity checks */ | 47 | /* Sanity checks */ | 
| 48 | 48 | ||
| 49 | #define SERIAL_INLINE | ||
| 50 | |||
| 51 | #if defined(MODULE) && defined(SERIAL_DEBUG_MCOUNT) | 49 | #if defined(MODULE) && defined(SERIAL_DEBUG_MCOUNT) | 
| 52 | #define DBG_CNT(s) printk("(%s): [%x] refc=%d, serc=%d, ttyc=%d -> %s\n", \ | 50 | #define DBG_CNT(s) printk("(%s): [%x] refc=%d, serc=%d, ttyc=%d -> %s\n", \ | 
| 53 | tty->name, (info->flags), serial_driver->refcount,info->count,tty->count,s) | 51 | tty->name, (info->flags), serial_driver->refcount,info->count,tty->count,s) | 
| @@ -95,10 +93,6 @@ static char *serial_version = "4.30"; | |||
| 95 | #include <asm/amigahw.h> | 93 | #include <asm/amigahw.h> | 
| 96 | #include <asm/amigaints.h> | 94 | #include <asm/amigaints.h> | 
| 97 | 95 | ||
| 98 | #ifdef SERIAL_INLINE | ||
| 99 | #define _INLINE_ inline | ||
| 100 | #endif | ||
| 101 | |||
| 102 | #define custom amiga_custom | 96 | #define custom amiga_custom | 
| 103 | static char *serial_name = "Amiga-builtin serial driver"; | 97 | static char *serial_name = "Amiga-builtin serial driver"; | 
| 104 | 98 | ||
| @@ -253,14 +247,14 @@ static void rs_start(struct tty_struct *tty) | |||
| 253 | * This routine is used by the interrupt handler to schedule | 247 | * This routine is used by the interrupt handler to schedule | 
| 254 | * processing in the software interrupt portion of the driver. | 248 | * processing in the software interrupt portion of the driver. | 
| 255 | */ | 249 | */ | 
| 256 | static _INLINE_ void rs_sched_event(struct async_struct *info, | 250 | static void rs_sched_event(struct async_struct *info, | 
| 257 | int event) | 251 | int event) | 
| 258 | { | 252 | { | 
| 259 | info->event |= 1 << event; | 253 | info->event |= 1 << event; | 
| 260 | tasklet_schedule(&info->tlet); | 254 | tasklet_schedule(&info->tlet); | 
| 261 | } | 255 | } | 
| 262 | 256 | ||
| 263 | static _INLINE_ void receive_chars(struct async_struct *info) | 257 | static void receive_chars(struct async_struct *info) | 
| 264 | { | 258 | { | 
| 265 | int status; | 259 | int status; | 
| 266 | int serdatr; | 260 | int serdatr; | 
| @@ -349,7 +343,7 @@ out: | |||
| 349 | return; | 343 | return; | 
| 350 | } | 344 | } | 
| 351 | 345 | ||
| 352 | static _INLINE_ void transmit_chars(struct async_struct *info) | 346 | static void transmit_chars(struct async_struct *info) | 
| 353 | { | 347 | { | 
| 354 | custom.intreq = IF_TBE; | 348 | custom.intreq = IF_TBE; | 
| 355 | mb(); | 349 | mb(); | 
| @@ -389,7 +383,7 @@ static _INLINE_ void transmit_chars(struct async_struct *info) | |||
| 389 | } | 383 | } | 
| 390 | } | 384 | } | 
| 391 | 385 | ||
| 392 | static _INLINE_ void check_modem_status(struct async_struct *info) | 386 | static void check_modem_status(struct async_struct *info) | 
| 393 | { | 387 | { | 
| 394 | unsigned char status = ciab.pra & (SER_DCD | SER_CTS | SER_DSR); | 388 | unsigned char status = ciab.pra & (SER_DCD | SER_CTS | SER_DSR); | 
| 395 | unsigned char dstatus; | 389 | unsigned char dstatus; | 
| @@ -1959,7 +1953,7 @@ done: | |||
| 1959 | * number, and identifies which options were configured into this | 1953 | * number, and identifies which options were configured into this | 
| 1960 | * driver. | 1954 | * driver. | 
| 1961 | */ | 1955 | */ | 
| 1962 | static _INLINE_ void show_serial_version(void) | 1956 | static void show_serial_version(void) | 
| 1963 | { | 1957 | { | 
| 1964 | printk(KERN_INFO "%s version %s\n", serial_name, serial_version); | 1958 | printk(KERN_INFO "%s version %s\n", serial_name, serial_version); | 
| 1965 | } | 1959 | } | 
| diff --git a/drivers/isdn/hisax/config.c b/drivers/isdn/hisax/config.c index df9d65201819..27332506f9f7 100644 --- a/drivers/isdn/hisax/config.c +++ b/drivers/isdn/hisax/config.c | |||
| @@ -25,7 +25,6 @@ | |||
| 25 | #include <linux/workqueue.h> | 25 | #include <linux/workqueue.h> | 
| 26 | #include <linux/interrupt.h> | 26 | #include <linux/interrupt.h> | 
| 27 | #define HISAX_STATUS_BUFSIZE 4096 | 27 | #define HISAX_STATUS_BUFSIZE 4096 | 
| 28 | #define INCLUDE_INLINE_FUNCS | ||
| 29 | 28 | ||
| 30 | /* | 29 | /* | 
| 31 | * This structure array contains one entry per card. An entry looks | 30 | * This structure array contains one entry per card. An entry looks | 
| diff --git a/drivers/isdn/hisax/elsa.c b/drivers/isdn/hisax/elsa.c index 110e9fd669c5..f8ca4b323331 100644 --- a/drivers/isdn/hisax/elsa.c +++ b/drivers/isdn/hisax/elsa.c | |||
| @@ -108,7 +108,6 @@ static const char *ITACVer[] = | |||
| 108 | #define ELSA_ASSIGN 4 | 108 | #define ELSA_ASSIGN 4 | 
| 109 | 109 | ||
| 110 | #define RS_ISR_PASS_LIMIT 256 | 110 | #define RS_ISR_PASS_LIMIT 256 | 
| 111 | #define _INLINE_ inline | ||
| 112 | #define FLG_MODEM_ACTIVE 1 | 111 | #define FLG_MODEM_ACTIVE 1 | 
| 113 | /* IPAC AUX */ | 112 | /* IPAC AUX */ | 
| 114 | #define ELSA_IPAC_LINE_LED 0x40 /* Bit 6 Gelbe LED */ | 113 | #define ELSA_IPAC_LINE_LED 0x40 /* Bit 6 Gelbe LED */ | 
| diff --git a/drivers/serial/68328serial.c b/drivers/serial/68328serial.c index 7f0f35a05dca..b88a7c1158af 100644 --- a/drivers/serial/68328serial.c +++ b/drivers/serial/68328serial.c | |||
| @@ -101,8 +101,6 @@ struct tty_driver *serial_driver; | |||
| 101 | 101 | ||
| 102 | #define RS_ISR_PASS_LIMIT 256 | 102 | #define RS_ISR_PASS_LIMIT 256 | 
| 103 | 103 | ||
| 104 | #define _INLINE_ inline | ||
| 105 | |||
| 106 | static void change_speed(struct m68k_serial *info); | 104 | static void change_speed(struct m68k_serial *info); | 
| 107 | 105 | ||
| 108 | /* | 106 | /* | 
| @@ -262,7 +260,7 @@ static void batten_down_hatches(void) | |||
| 262 | /* Drop into the debugger */ | 260 | /* Drop into the debugger */ | 
| 263 | } | 261 | } | 
| 264 | 262 | ||
| 265 | static _INLINE_ void status_handle(struct m68k_serial *info, unsigned short status) | 263 | static void status_handle(struct m68k_serial *info, unsigned short status) | 
| 266 | { | 264 | { | 
| 267 | #if 0 | 265 | #if 0 | 
| 268 | if(status & DCD) { | 266 | if(status & DCD) { | 
| @@ -289,7 +287,8 @@ static _INLINE_ void status_handle(struct m68k_serial *info, unsigned short stat | |||
| 289 | return; | 287 | return; | 
| 290 | } | 288 | } | 
| 291 | 289 | ||
| 292 | static _INLINE_ void receive_chars(struct m68k_serial *info, struct pt_regs *regs, unsigned short rx) | 290 | static void receive_chars(struct m68k_serial *info, struct pt_regs *regs, | 
| 291 | unsigned short rx) | ||
| 293 | { | 292 | { | 
| 294 | struct tty_struct *tty = info->tty; | 293 | struct tty_struct *tty = info->tty; | 
| 295 | m68328_uart *uart = &uart_addr[info->line]; | 294 | m68328_uart *uart = &uart_addr[info->line]; | 
| @@ -359,7 +358,7 @@ clear_and_exit: | |||
| 359 | return; | 358 | return; | 
| 360 | } | 359 | } | 
| 361 | 360 | ||
| 362 | static _INLINE_ void transmit_chars(struct m68k_serial *info) | 361 | static void transmit_chars(struct m68k_serial *info) | 
| 363 | { | 362 | { | 
| 364 | m68328_uart *uart = &uart_addr[info->line]; | 363 | m68328_uart *uart = &uart_addr[info->line]; | 
| 365 | 364 | ||
| diff --git a/drivers/serial/au1x00_uart.c b/drivers/serial/au1x00_uart.c index 29f94bbb79be..948880ac5878 100644 --- a/drivers/serial/au1x00_uart.c +++ b/drivers/serial/au1x00_uart.c | |||
| @@ -133,13 +133,12 @@ static const struct serial_uart_config uart_config[PORT_MAX_8250+1] = { | |||
| 133 | { "AU1X00_UART",16, UART_CLEAR_FIFO | UART_USE_FIFO }, | 133 | { "AU1X00_UART",16, UART_CLEAR_FIFO | UART_USE_FIFO }, | 
| 134 | }; | 134 | }; | 
| 135 | 135 | ||
| 136 | static _INLINE_ unsigned int serial_in(struct uart_8250_port *up, int offset) | 136 | static unsigned int serial_in(struct uart_8250_port *up, int offset) | 
| 137 | { | 137 | { | 
| 138 | return au_readl((unsigned long)up->port.membase + offset); | 138 | return au_readl((unsigned long)up->port.membase + offset); | 
| 139 | } | 139 | } | 
| 140 | 140 | ||
| 141 | static _INLINE_ void | 141 | static void serial_out(struct uart_8250_port *up, int offset, int value) | 
| 142 | serial_out(struct uart_8250_port *up, int offset, int value) | ||
| 143 | { | 142 | { | 
| 144 | au_writel(value, (unsigned long)up->port.membase + offset); | 143 | au_writel(value, (unsigned long)up->port.membase + offset); | 
| 145 | } | 144 | } | 
| @@ -237,7 +236,7 @@ static void serial8250_enable_ms(struct uart_port *port) | |||
| 237 | serial_out(up, UART_IER, up->ier); | 236 | serial_out(up, UART_IER, up->ier); | 
| 238 | } | 237 | } | 
| 239 | 238 | ||
| 240 | static _INLINE_ void | 239 | static void | 
| 241 | receive_chars(struct uart_8250_port *up, int *status, struct pt_regs *regs) | 240 | receive_chars(struct uart_8250_port *up, int *status, struct pt_regs *regs) | 
| 242 | { | 241 | { | 
| 243 | struct tty_struct *tty = up->port.info->tty; | 242 | 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) | |||
| 312 | spin_lock(&up->port.lock); | 311 | spin_lock(&up->port.lock); | 
| 313 | } | 312 | } | 
| 314 | 313 | ||
| 315 | static _INLINE_ void transmit_chars(struct uart_8250_port *up) | 314 | static void transmit_chars(struct uart_8250_port *up) | 
| 316 | { | 315 | { | 
| 317 | struct circ_buf *xmit = &up->port.info->xmit; | 316 | struct circ_buf *xmit = &up->port.info->xmit; | 
| 318 | int count; | 317 | int count; | 
| @@ -346,7 +345,7 @@ static _INLINE_ void transmit_chars(struct uart_8250_port *up) | |||
| 346 | serial8250_stop_tx(&up->port); | 345 | serial8250_stop_tx(&up->port); | 
| 347 | } | 346 | } | 
| 348 | 347 | ||
| 349 | static _INLINE_ void check_modem_status(struct uart_8250_port *up) | 348 | static void check_modem_status(struct uart_8250_port *up) | 
| 350 | { | 349 | { | 
| 351 | int status; | 350 | int status; | 
| 352 | 351 | ||
| diff --git a/drivers/serial/crisv10.c b/drivers/serial/crisv10.c index be12623d8544..89700141f87e 100644 --- a/drivers/serial/crisv10.c +++ b/drivers/serial/crisv10.c | |||
| @@ -481,8 +481,6 @@ static char *serial_version = "$Revision: 1.25 $"; | |||
| 481 | #include "serial_compat.h" | 481 | #include "serial_compat.h" | 
| 482 | #endif | 482 | #endif | 
| 483 | 483 | ||
| 484 | #define _INLINE_ inline | ||
| 485 | |||
| 486 | struct tty_driver *serial_driver; | 484 | struct tty_driver *serial_driver; | 
| 487 | 485 | ||
| 488 | /* serial subtype definitions */ | 486 | /* serial subtype definitions */ | 
| @@ -591,8 +589,6 @@ static void rs_throttle(struct tty_struct * tty); | |||
| 591 | static void rs_wait_until_sent(struct tty_struct *tty, int timeout); | 589 | static void rs_wait_until_sent(struct tty_struct *tty, int timeout); | 
| 592 | static int rs_write(struct tty_struct * tty, int from_user, | 590 | static int rs_write(struct tty_struct * tty, int from_user, | 
| 593 | const unsigned char *buf, int count); | 591 | const unsigned char *buf, int count); | 
| 594 | extern _INLINE_ int rs_raw_write(struct tty_struct * tty, int from_user, | ||
| 595 | const unsigned char *buf, int count); | ||
| 596 | #ifdef CONFIG_ETRAX_RS485 | 592 | #ifdef CONFIG_ETRAX_RS485 | 
| 597 | static int e100_write_rs485(struct tty_struct * tty, int from_user, | 593 | static int e100_write_rs485(struct tty_struct * tty, int from_user, | 
| 598 | const unsigned char *buf, int count); | 594 | const unsigned char *buf, int count); | 
| @@ -1538,8 +1534,7 @@ e100_enable_rxdma_irq(struct e100_serial *info) | |||
| 1538 | 1534 | ||
| 1539 | /* the tx DMA uses only dma_descr interrupt */ | 1535 | /* the tx DMA uses only dma_descr interrupt */ | 
| 1540 | 1536 | ||
| 1541 | static _INLINE_ void | 1537 | static void e100_disable_txdma_irq(struct e100_serial *info) | 
| 1542 | e100_disable_txdma_irq(struct e100_serial *info) | ||
| 1543 | { | 1538 | { | 
| 1544 | #ifdef SERIAL_DEBUG_INTR | 1539 | #ifdef SERIAL_DEBUG_INTR | 
| 1545 | printk("txdma_irq(%d): 0\n",info->line); | 1540 | printk("txdma_irq(%d): 0\n",info->line); | 
| @@ -1548,8 +1543,7 @@ e100_disable_txdma_irq(struct e100_serial *info) | |||
| 1548 | *R_IRQ_MASK2_CLR = info->irq; | 1543 | *R_IRQ_MASK2_CLR = info->irq; | 
| 1549 | } | 1544 | } | 
| 1550 | 1545 | ||
| 1551 | static _INLINE_ void | 1546 | static void e100_enable_txdma_irq(struct e100_serial *info) | 
| 1552 | e100_enable_txdma_irq(struct e100_serial *info) | ||
| 1553 | { | 1547 | { | 
| 1554 | #ifdef SERIAL_DEBUG_INTR | 1548 | #ifdef SERIAL_DEBUG_INTR | 
| 1555 | printk("txdma_irq(%d): 1\n",info->line); | 1549 | printk("txdma_irq(%d): 1\n",info->line); | 
| @@ -1558,8 +1552,7 @@ e100_enable_txdma_irq(struct e100_serial *info) | |||
| 1558 | *R_IRQ_MASK2_SET = info->irq; | 1552 | *R_IRQ_MASK2_SET = info->irq; | 
| 1559 | } | 1553 | } | 
| 1560 | 1554 | ||
| 1561 | static _INLINE_ void | 1555 | static void e100_disable_txdma_channel(struct e100_serial *info) | 
| 1562 | e100_disable_txdma_channel(struct e100_serial *info) | ||
| 1563 | { | 1556 | { | 
| 1564 | unsigned long flags; | 1557 | unsigned long flags; | 
| 1565 | 1558 | ||
| @@ -1599,8 +1592,7 @@ e100_disable_txdma_channel(struct e100_serial *info) | |||
| 1599 | } | 1592 | } | 
| 1600 | 1593 | ||
| 1601 | 1594 | ||
| 1602 | static _INLINE_ void | 1595 | static void e100_enable_txdma_channel(struct e100_serial *info) | 
| 1603 | e100_enable_txdma_channel(struct e100_serial *info) | ||
| 1604 | { | 1596 | { | 
| 1605 | unsigned long flags; | 1597 | unsigned long flags; | 
| 1606 | 1598 | ||
| @@ -1625,8 +1617,7 @@ e100_enable_txdma_channel(struct e100_serial *info) | |||
| 1625 | restore_flags(flags); | 1617 | restore_flags(flags); | 
| 1626 | } | 1618 | } | 
| 1627 | 1619 | ||
| 1628 | static _INLINE_ void | 1620 | static void e100_disable_rxdma_channel(struct e100_serial *info) | 
| 1629 | e100_disable_rxdma_channel(struct e100_serial *info) | ||
| 1630 | { | 1621 | { | 
| 1631 | unsigned long flags; | 1622 | unsigned long flags; | 
| 1632 | 1623 | ||
| @@ -1665,8 +1656,7 @@ e100_disable_rxdma_channel(struct e100_serial *info) | |||
| 1665 | } | 1656 | } | 
| 1666 | 1657 | ||
| 1667 | 1658 | ||
| 1668 | static _INLINE_ void | 1659 | static void e100_enable_rxdma_channel(struct e100_serial *info) | 
| 1669 | e100_enable_rxdma_channel(struct e100_serial *info) | ||
| 1670 | { | 1660 | { | 
| 1671 | unsigned long flags; | 1661 | unsigned long flags; | 
| 1672 | 1662 | ||
| @@ -1913,9 +1903,7 @@ rs_start(struct tty_struct *tty) | |||
| 1913 | * This routine is used by the interrupt handler to schedule | 1903 | * This routine is used by the interrupt handler to schedule | 
| 1914 | * processing in the software interrupt portion of the driver. | 1904 | * processing in the software interrupt portion of the driver. | 
| 1915 | */ | 1905 | */ | 
| 1916 | static _INLINE_ void | 1906 | static void rs_sched_event(struct e100_serial *info, int event) | 
| 1917 | rs_sched_event(struct e100_serial *info, | ||
| 1918 | int event) | ||
| 1919 | { | 1907 | { | 
| 1920 | if (info->event & (1 << event)) | 1908 | if (info->event & (1 << event)) | 
| 1921 | return; | 1909 | return; | 
| @@ -2155,8 +2143,9 @@ add_char_and_flag(struct e100_serial *info, unsigned char data, unsigned char fl | |||
| 2155 | return 1; | 2143 | return 1; | 
| 2156 | } | 2144 | } | 
| 2157 | 2145 | ||
| 2158 | extern _INLINE_ unsigned int | 2146 | static unsigned int handle_descr_data(struct e100_serial *info, | 
| 2159 | handle_descr_data(struct e100_serial *info, struct etrax_dma_descr *descr, unsigned int recvl) | 2147 | struct etrax_dma_descr *descr, | 
| 2148 | unsigned int recvl) | ||
| 2160 | { | 2149 | { | 
| 2161 | struct etrax_recv_buffer *buffer = phys_to_virt(descr->buf) - sizeof *buffer; | 2150 | struct etrax_recv_buffer *buffer = phys_to_virt(descr->buf) - sizeof *buffer; | 
| 2162 | 2151 | ||
| @@ -2182,8 +2171,7 @@ handle_descr_data(struct e100_serial *info, struct etrax_dma_descr *descr, unsig | |||
| 2182 | return recvl; | 2171 | return recvl; | 
| 2183 | } | 2172 | } | 
| 2184 | 2173 | ||
| 2185 | static _INLINE_ unsigned int | 2174 | static unsigned int handle_all_descr_data(struct e100_serial *info) | 
| 2186 | handle_all_descr_data(struct e100_serial *info) | ||
| 2187 | { | 2175 | { | 
| 2188 | struct etrax_dma_descr *descr; | 2176 | struct etrax_dma_descr *descr; | 
| 2189 | unsigned int recvl; | 2177 | unsigned int recvl; | 
| @@ -2230,8 +2218,7 @@ handle_all_descr_data(struct e100_serial *info) | |||
| 2230 | return ret; | 2218 | return ret; | 
| 2231 | } | 2219 | } | 
| 2232 | 2220 | ||
| 2233 | static _INLINE_ void | 2221 | static void receive_chars_dma(struct e100_serial *info) | 
| 2234 | receive_chars_dma(struct e100_serial *info) | ||
| 2235 | { | 2222 | { | 
| 2236 | struct tty_struct *tty; | 2223 | struct tty_struct *tty; | 
| 2237 | unsigned char rstat; | 2224 | unsigned char rstat; | 
| @@ -2292,8 +2279,7 @@ receive_chars_dma(struct e100_serial *info) | |||
| 2292 | *info->icmdadr = IO_STATE(R_DMA_CH6_CMD, cmd, restart); | 2279 | *info->icmdadr = IO_STATE(R_DMA_CH6_CMD, cmd, restart); | 
| 2293 | } | 2280 | } | 
| 2294 | 2281 | ||
| 2295 | static _INLINE_ int | 2282 | static int start_recv_dma(struct e100_serial *info) | 
| 2296 | start_recv_dma(struct e100_serial *info) | ||
| 2297 | { | 2283 | { | 
| 2298 | struct etrax_dma_descr *descr = info->rec_descr; | 2284 | struct etrax_dma_descr *descr = info->rec_descr; | 
| 2299 | struct etrax_recv_buffer *buffer; | 2285 | struct etrax_recv_buffer *buffer; | 
| @@ -2348,11 +2334,6 @@ start_receive(struct e100_serial *info) | |||
| 2348 | } | 2334 | } | 
| 2349 | 2335 | ||
| 2350 | 2336 | ||
| 2351 | static _INLINE_ void | ||
| 2352 | status_handle(struct e100_serial *info, unsigned short status) | ||
| 2353 | { | ||
| 2354 | } | ||
| 2355 | |||
| 2356 | /* the bits in the MASK2 register are laid out like this: | 2337 | /* the bits in the MASK2 register are laid out like this: | 
| 2357 | DMAI_EOP DMAI_DESCR DMAO_EOP DMAO_DESCR | 2338 | DMAI_EOP DMAI_DESCR DMAO_EOP DMAO_DESCR | 
| 2358 | where I is the input channel and O is the output channel for the port. | 2339 | 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) | |||
| 2454 | return IRQ_RETVAL(handled); | 2435 | return IRQ_RETVAL(handled); | 
| 2455 | } /* rec_interrupt */ | 2436 | } /* rec_interrupt */ | 
| 2456 | 2437 | ||
| 2457 | static _INLINE_ int | 2438 | static int force_eop_if_needed(struct e100_serial *info) | 
| 2458 | force_eop_if_needed(struct e100_serial *info) | ||
| 2459 | { | 2439 | { | 
| 2460 | /* We check data_avail bit to determine if data has | 2440 | /* We check data_avail bit to determine if data has | 
| 2461 | * arrived since last time | 2441 | * arrived since last time | 
| @@ -2499,8 +2479,7 @@ force_eop_if_needed(struct e100_serial *info) | |||
| 2499 | return 1; | 2479 | return 1; | 
| 2500 | } | 2480 | } | 
| 2501 | 2481 | ||
| 2502 | extern _INLINE_ void | 2482 | static void flush_to_flip_buffer(struct e100_serial *info) | 
| 2503 | flush_to_flip_buffer(struct e100_serial *info) | ||
| 2504 | { | 2483 | { | 
| 2505 | struct tty_struct *tty; | 2484 | struct tty_struct *tty; | 
| 2506 | struct etrax_recv_buffer *buffer; | 2485 | struct etrax_recv_buffer *buffer; | 
| @@ -2611,8 +2590,7 @@ flush_to_flip_buffer(struct e100_serial *info) | |||
| 2611 | tty_flip_buffer_push(tty); | 2590 | tty_flip_buffer_push(tty); | 
| 2612 | } | 2591 | } | 
| 2613 | 2592 | ||
| 2614 | static _INLINE_ void | 2593 | static void check_flush_timeout(struct e100_serial *info) | 
| 2615 | check_flush_timeout(struct e100_serial *info) | ||
| 2616 | { | 2594 | { | 
| 2617 | /* Flip what we've got (if we can) */ | 2595 | /* Flip what we've got (if we can) */ | 
| 2618 | flush_to_flip_buffer(info); | 2596 | flush_to_flip_buffer(info); | 
| @@ -2741,7 +2719,7 @@ TODO: The break will be delayed until an F or V character is received. | |||
| 2741 | 2719 | ||
| 2742 | */ | 2720 | */ | 
| 2743 | 2721 | ||
| 2744 | extern _INLINE_ | 2722 | static | 
| 2745 | struct e100_serial * handle_ser_rx_interrupt_no_dma(struct e100_serial *info) | 2723 | struct e100_serial * handle_ser_rx_interrupt_no_dma(struct e100_serial *info) | 
| 2746 | { | 2724 | { | 
| 2747 | unsigned long data_read; | 2725 | unsigned long data_read; | 
| @@ -2875,8 +2853,7 @@ more_data: | |||
| 2875 | return info; | 2853 | return info; | 
| 2876 | } | 2854 | } | 
| 2877 | 2855 | ||
| 2878 | extern _INLINE_ | 2856 | static struct e100_serial* handle_ser_rx_interrupt(struct e100_serial *info) | 
| 2879 | struct e100_serial* handle_ser_rx_interrupt(struct e100_serial *info) | ||
| 2880 | { | 2857 | { | 
| 2881 | unsigned char rstat; | 2858 | unsigned char rstat; | 
| 2882 | 2859 | ||
| @@ -2995,7 +2972,7 @@ struct e100_serial* handle_ser_rx_interrupt(struct e100_serial *info) | |||
| 2995 | return info; | 2972 | return info; | 
| 2996 | } /* handle_ser_rx_interrupt */ | 2973 | } /* handle_ser_rx_interrupt */ | 
| 2997 | 2974 | ||
| 2998 | extern _INLINE_ void handle_ser_tx_interrupt(struct e100_serial *info) | 2975 | static void handle_ser_tx_interrupt(struct e100_serial *info) | 
| 2999 | { | 2976 | { | 
| 3000 | unsigned long flags; | 2977 | unsigned long flags; | 
| 3001 | 2978 | ||
| @@ -3621,9 +3598,8 @@ rs_flush_chars(struct tty_struct *tty) | |||
| 3621 | restore_flags(flags); | 3598 | restore_flags(flags); | 
| 3622 | } | 3599 | } | 
| 3623 | 3600 | ||
| 3624 | extern _INLINE_ int | 3601 | static int rs_raw_write(struct tty_struct * tty, int from_user, | 
| 3625 | rs_raw_write(struct tty_struct * tty, int from_user, | 3602 | const unsigned char *buf, int count) | 
| 3626 | const unsigned char *buf, int count) | ||
| 3627 | { | 3603 | { | 
| 3628 | int c, ret = 0; | 3604 | int c, ret = 0; | 
| 3629 | struct e100_serial *info = (struct e100_serial *)tty->driver_data; | 3605 | struct e100_serial *info = (struct e100_serial *)tty->driver_data; | 
| @@ -4710,7 +4686,7 @@ rs_open(struct tty_struct *tty, struct file * filp) | |||
| 4710 | * /proc fs routines.... | 4686 | * /proc fs routines.... | 
| 4711 | */ | 4687 | */ | 
| 4712 | 4688 | ||
| 4713 | extern _INLINE_ int line_info(char *buf, struct e100_serial *info) | 4689 | static int line_info(char *buf, struct e100_serial *info) | 
| 4714 | { | 4690 | { | 
| 4715 | char stat_buf[30]; | 4691 | char stat_buf[30]; | 
| 4716 | int ret; | 4692 | int ret; | 
| diff --git a/drivers/serial/m32r_sio.c b/drivers/serial/m32r_sio.c index 876bc5e027bb..e9c10c0a30fc 100644 --- a/drivers/serial/m32r_sio.c +++ b/drivers/serial/m32r_sio.c | |||
| @@ -248,17 +248,17 @@ static void sio_error(int *status) | |||
| 248 | 248 | ||
| 249 | #endif /* CONFIG_SERIAL_M32R_PLDSIO */ | 249 | #endif /* CONFIG_SERIAL_M32R_PLDSIO */ | 
| 250 | 250 | ||
| 251 | static _INLINE_ unsigned int sio_in(struct uart_sio_port *up, int offset) | 251 | static unsigned int sio_in(struct uart_sio_port *up, int offset) | 
| 252 | { | 252 | { | 
| 253 | return __sio_in(up->port.iobase + offset); | 253 | return __sio_in(up->port.iobase + offset); | 
| 254 | } | 254 | } | 
| 255 | 255 | ||
| 256 | static _INLINE_ void sio_out(struct uart_sio_port *up, int offset, int value) | 256 | static void sio_out(struct uart_sio_port *up, int offset, int value) | 
| 257 | { | 257 | { | 
| 258 | __sio_out(value, up->port.iobase + offset); | 258 | __sio_out(value, up->port.iobase + offset); | 
| 259 | } | 259 | } | 
| 260 | 260 | ||
| 261 | static _INLINE_ unsigned int serial_in(struct uart_sio_port *up, int offset) | 261 | static unsigned int serial_in(struct uart_sio_port *up, int offset) | 
| 262 | { | 262 | { | 
| 263 | if (!offset) | 263 | if (!offset) | 
| 264 | return 0; | 264 | return 0; | 
| @@ -266,8 +266,7 @@ static _INLINE_ unsigned int serial_in(struct uart_sio_port *up, int offset) | |||
| 266 | return __sio_in(offset); | 266 | return __sio_in(offset); | 
| 267 | } | 267 | } | 
| 268 | 268 | ||
| 269 | static _INLINE_ void | 269 | static void serial_out(struct uart_sio_port *up, int offset, int value) | 
| 270 | serial_out(struct uart_sio_port *up, int offset, int value) | ||
| 271 | { | 270 | { | 
| 272 | if (!offset) | 271 | if (!offset) | 
| 273 | return; | 272 | return; | 
| @@ -326,8 +325,8 @@ static void m32r_sio_enable_ms(struct uart_port *port) | |||
| 326 | serial_out(up, UART_IER, up->ier); | 325 | serial_out(up, UART_IER, up->ier); | 
| 327 | } | 326 | } | 
| 328 | 327 | ||
| 329 | static _INLINE_ void receive_chars(struct uart_sio_port *up, int *status, | 328 | static void receive_chars(struct uart_sio_port *up, int *status, | 
| 330 | struct pt_regs *regs) | 329 | struct pt_regs *regs) | 
| 331 | { | 330 | { | 
| 332 | struct tty_struct *tty = up->port.info->tty; | 331 | struct tty_struct *tty = up->port.info->tty; | 
| 333 | unsigned char ch; | 332 | unsigned char ch; | 
| @@ -400,7 +399,7 @@ static _INLINE_ void receive_chars(struct uart_sio_port *up, int *status, | |||
| 400 | tty_flip_buffer_push(tty); | 399 | tty_flip_buffer_push(tty); | 
| 401 | } | 400 | } | 
| 402 | 401 | ||
| 403 | static _INLINE_ void transmit_chars(struct uart_sio_port *up) | 402 | static void transmit_chars(struct uart_sio_port *up) | 
| 404 | { | 403 | { | 
| 405 | struct circ_buf *xmit = &up->port.info->xmit; | 404 | struct circ_buf *xmit = &up->port.info->xmit; | 
| 406 | int count; | 405 | int count; | 
| diff --git a/drivers/serial/sunsu.c b/drivers/serial/sunsu.c index 7fc3d3b41d18..9fe2283d91e5 100644 --- a/drivers/serial/sunsu.c +++ b/drivers/serial/sunsu.c | |||
| @@ -102,9 +102,7 @@ struct uart_sunsu_port { | |||
| 102 | #endif | 102 | #endif | 
| 103 | }; | 103 | }; | 
| 104 | 104 | ||
| 105 | #define _INLINE_ | 105 | static unsigned int serial_in(struct uart_sunsu_port *up, int offset) | 
| 106 | |||
| 107 | static _INLINE_ unsigned int serial_in(struct uart_sunsu_port *up, int offset) | ||
| 108 | { | 106 | { | 
| 109 | offset <<= up->port.regshift; | 107 | offset <<= up->port.regshift; | 
| 110 | 108 | ||
| @@ -121,8 +119,7 @@ static _INLINE_ unsigned int serial_in(struct uart_sunsu_port *up, int offset) | |||
| 121 | } | 119 | } | 
| 122 | } | 120 | } | 
| 123 | 121 | ||
| 124 | static _INLINE_ void | 122 | static void serial_out(struct uart_sunsu_port *up, int offset, int value) | 
| 125 | serial_out(struct uart_sunsu_port *up, int offset, int value) | ||
| 126 | { | 123 | { | 
| 127 | #ifndef CONFIG_SPARC64 | 124 | #ifndef CONFIG_SPARC64 | 
| 128 | /* | 125 | /* | 
| @@ -316,7 +313,7 @@ static void sunsu_enable_ms(struct uart_port *port) | |||
| 316 | spin_unlock_irqrestore(&up->port.lock, flags); | 313 | spin_unlock_irqrestore(&up->port.lock, flags); | 
| 317 | } | 314 | } | 
| 318 | 315 | ||
| 319 | static _INLINE_ struct tty_struct * | 316 | static struct tty_struct * | 
| 320 | receive_chars(struct uart_sunsu_port *up, unsigned char *status, struct pt_regs *regs) | 317 | receive_chars(struct uart_sunsu_port *up, unsigned char *status, struct pt_regs *regs) | 
| 321 | { | 318 | { | 
| 322 | struct tty_struct *tty = up->port.info->tty; | 319 | 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 | |||
| 395 | return tty; | 392 | return tty; | 
| 396 | } | 393 | } | 
| 397 | 394 | ||
| 398 | static _INLINE_ void transmit_chars(struct uart_sunsu_port *up) | 395 | static void transmit_chars(struct uart_sunsu_port *up) | 
| 399 | { | 396 | { | 
| 400 | struct circ_buf *xmit = &up->port.info->xmit; | 397 | struct circ_buf *xmit = &up->port.info->xmit; | 
| 401 | int count; | 398 | int count; | 
| @@ -431,7 +428,7 @@ static _INLINE_ void transmit_chars(struct uart_sunsu_port *up) | |||
| 431 | __stop_tx(up); | 428 | __stop_tx(up); | 
| 432 | } | 429 | } | 
| 433 | 430 | ||
| 434 | static _INLINE_ void check_modem_status(struct uart_sunsu_port *up) | 431 | static void check_modem_status(struct uart_sunsu_port *up) | 
| 435 | { | 432 | { | 
| 436 | int status; | 433 | int status; | 
| 437 | 434 | ||
| diff --git a/drivers/tc/zs.c b/drivers/tc/zs.c index 6756d0fab6fe..2dffa8e303b2 100644 --- a/drivers/tc/zs.c +++ b/drivers/tc/zs.c | |||
| @@ -186,8 +186,6 @@ static struct tty_driver *serial_driver; | |||
| 186 | #define RS_STROBE_TIME 10 | 186 | #define RS_STROBE_TIME 10 | 
| 187 | #define RS_ISR_PASS_LIMIT 256 | 187 | #define RS_ISR_PASS_LIMIT 256 | 
| 188 | 188 | ||
| 189 | #define _INLINE_ inline | ||
| 190 | |||
| 191 | static void probe_sccs(void); | 189 | static void probe_sccs(void); | 
| 192 | static void change_speed(struct dec_serial *info); | 190 | static void change_speed(struct dec_serial *info); | 
| 193 | static void rs_wait_until_sent(struct tty_struct *tty, int timeout); | 191 | static void rs_wait_until_sent(struct tty_struct *tty, int timeout); | 
| @@ -344,14 +342,13 @@ static inline void rs_recv_clear(struct dec_zschannel *zsc) | |||
| 344 | * This routine is used by the interrupt handler to schedule | 342 | * This routine is used by the interrupt handler to schedule | 
| 345 | * processing in the software interrupt portion of the driver. | 343 | * processing in the software interrupt portion of the driver. | 
| 346 | */ | 344 | */ | 
| 347 | static _INLINE_ void rs_sched_event(struct dec_serial *info, int event) | 345 | static void rs_sched_event(struct dec_serial *info, int event) | 
| 348 | { | 346 | { | 
| 349 | info->event |= 1 << event; | 347 | info->event |= 1 << event; | 
| 350 | tasklet_schedule(&info->tlet); | 348 | tasklet_schedule(&info->tlet); | 
| 351 | } | 349 | } | 
| 352 | 350 | ||
| 353 | static _INLINE_ void receive_chars(struct dec_serial *info, | 351 | static void receive_chars(struct dec_serial *info, struct pt_regs *regs) | 
| 354 | struct pt_regs *regs) | ||
| 355 | { | 352 | { | 
| 356 | struct tty_struct *tty = info->tty; | 353 | struct tty_struct *tty = info->tty; | 
| 357 | unsigned char ch, stat, flag; | 354 | unsigned char ch, stat, flag; | 
| @@ -441,7 +438,7 @@ static void transmit_chars(struct dec_serial *info) | |||
| 441 | rs_sched_event(info, RS_EVENT_WRITE_WAKEUP); | 438 | rs_sched_event(info, RS_EVENT_WRITE_WAKEUP); | 
| 442 | } | 439 | } | 
| 443 | 440 | ||
| 444 | static _INLINE_ void status_handle(struct dec_serial *info) | 441 | static void status_handle(struct dec_serial *info) | 
| 445 | { | 442 | { | 
| 446 | unsigned char stat; | 443 | unsigned char stat; | 
| 447 | 444 | ||
| diff --git a/include/linux/tty_flip.h b/include/linux/tty_flip.h index 222faf97d5f9..0c6169fff366 100644 --- a/include/linux/tty_flip.h +++ b/include/linux/tty_flip.h | |||
| @@ -7,14 +7,8 @@ extern int tty_insert_flip_string_flags(struct tty_struct *tty, unsigned char *c | |||
| 7 | extern int tty_prepare_flip_string(struct tty_struct *tty, unsigned char **chars, size_t size); | 7 | extern int tty_prepare_flip_string(struct tty_struct *tty, unsigned char **chars, size_t size); | 
| 8 | extern int tty_prepare_flip_string_flags(struct tty_struct *tty, unsigned char **chars, char **flags, size_t size); | 8 | extern int tty_prepare_flip_string_flags(struct tty_struct *tty, unsigned char **chars, char **flags, size_t size); | 
| 9 | 9 | ||
| 10 | #ifdef INCLUDE_INLINE_FUNCS | 10 | static inline int tty_insert_flip_char(struct tty_struct *tty, | 
| 11 | #define _INLINE_ extern | 11 | unsigned char ch, char flag) | 
| 12 | #else | ||
| 13 | #define _INLINE_ static __inline__ | ||
| 14 | #endif | ||
| 15 | |||
| 16 | _INLINE_ int tty_insert_flip_char(struct tty_struct *tty, | ||
| 17 | unsigned char ch, char flag) | ||
| 18 | { | 12 | { | 
| 19 | struct tty_buffer *tb = tty->buf.tail; | 13 | struct tty_buffer *tb = tty->buf.tail; | 
| 20 | if (tb && tb->active && tb->used < tb->size) { | 14 | if (tb && tb->active && tb->used < tb->size) { | 
| @@ -25,7 +19,7 @@ _INLINE_ int tty_insert_flip_char(struct tty_struct *tty, | |||
| 25 | return tty_insert_flip_string_flags(tty, &ch, &flag, 1); | 19 | return tty_insert_flip_string_flags(tty, &ch, &flag, 1); | 
| 26 | } | 20 | } | 
| 27 | 21 | ||
| 28 | _INLINE_ void tty_schedule_flip(struct tty_struct *tty) | 22 | static inline void tty_schedule_flip(struct tty_struct *tty) | 
| 29 | { | 23 | { | 
| 30 | unsigned long flags; | 24 | unsigned long flags; | 
| 31 | spin_lock_irqsave(&tty->buf.lock, flags); | 25 | spin_lock_irqsave(&tty->buf.lock, flags); | 
