diff options
Diffstat (limited to 'drivers/tty')
31 files changed, 59 insertions, 59 deletions
diff --git a/drivers/tty/hvc/hvc_iucv.c b/drivers/tty/hvc/hvc_iucv.c index c3425bb3a1f6..b6f7d52f7c35 100644 --- a/drivers/tty/hvc/hvc_iucv.c +++ b/drivers/tty/hvc/hvc_iucv.c | |||
@@ -255,7 +255,7 @@ static int hvc_iucv_write(struct hvc_iucv_private *priv, | |||
255 | default: | 255 | default: |
256 | written = -EIO; | 256 | written = -EIO; |
257 | } | 257 | } |
258 | /* remove buffer if an error has occured or received data | 258 | /* remove buffer if an error has occurred or received data |
259 | * is not correct */ | 259 | * is not correct */ |
260 | if (rc || (rb->mbuf->version != MSG_VERSION) || | 260 | if (rc || (rb->mbuf->version != MSG_VERSION) || |
261 | (rb->msg.length != MSG_SIZE(rb->mbuf->datalen))) | 261 | (rb->msg.length != MSG_SIZE(rb->mbuf->datalen))) |
@@ -620,7 +620,7 @@ static void hvc_iucv_hangup(struct hvc_iucv_private *priv) | |||
620 | * the index of an struct hvc_iucv_private instance. | 620 | * the index of an struct hvc_iucv_private instance. |
621 | * | 621 | * |
622 | * This routine notifies the HVC back-end that a tty hangup (carrier loss, | 622 | * This routine notifies the HVC back-end that a tty hangup (carrier loss, |
623 | * virtual or otherwise) has occured. | 623 | * virtual or otherwise) has occurred. |
624 | * The z/VM IUCV HVC device driver ignores virtual hangups (vhangup()) | 624 | * The z/VM IUCV HVC device driver ignores virtual hangups (vhangup()) |
625 | * to keep an existing IUCV communication path established. | 625 | * to keep an existing IUCV communication path established. |
626 | * (Background: vhangup() is called from user space (by getty or login) to | 626 | * (Background: vhangup() is called from user space (by getty or login) to |
diff --git a/drivers/tty/hvc/hvc_vio.c b/drivers/tty/hvc/hvc_vio.c index 5e2f52b33327..e6eea1485244 100644 --- a/drivers/tty/hvc/hvc_vio.c +++ b/drivers/tty/hvc/hvc_vio.c | |||
@@ -1,7 +1,7 @@ | |||
1 | /* | 1 | /* |
2 | * vio driver interface to hvc_console.c | 2 | * vio driver interface to hvc_console.c |
3 | * | 3 | * |
4 | * This code was moved here to allow the remaing code to be reused as a | 4 | * This code was moved here to allow the remaining code to be reused as a |
5 | * generic polling mode with semi-reliable transport driver core to the | 5 | * generic polling mode with semi-reliable transport driver core to the |
6 | * console and tty subsystems. | 6 | * console and tty subsystems. |
7 | * | 7 | * |
diff --git a/drivers/tty/hvc/hvcs.c b/drivers/tty/hvc/hvcs.c index bef238f9ffd7..4c8b66546930 100644 --- a/drivers/tty/hvc/hvcs.c +++ b/drivers/tty/hvc/hvcs.c | |||
@@ -118,7 +118,7 @@ | |||
118 | * arch/powerepc/include/asm/hvcserver.h | 118 | * arch/powerepc/include/asm/hvcserver.h |
119 | * | 119 | * |
120 | * 1.3.2 -> 1.3.3 Replaced yield() in hvcs_close() with tty_wait_until_sent() to | 120 | * 1.3.2 -> 1.3.3 Replaced yield() in hvcs_close() with tty_wait_until_sent() to |
121 | * prevent possible lockup with realtime scheduling as similarily pointed out by | 121 | * prevent possible lockup with realtime scheduling as similarly pointed out by |
122 | * akpm in hvc_console. Changed resulted in the removal of hvcs_final_close() | 122 | * akpm in hvc_console. Changed resulted in the removal of hvcs_final_close() |
123 | * to reorder cleanup operations and prevent discarding of pending data during | 123 | * to reorder cleanup operations and prevent discarding of pending data during |
124 | * an hvcs_close(). Removed spinlock protection of hvcs_struct data members in | 124 | * an hvcs_close(). Removed spinlock protection of hvcs_struct data members in |
@@ -581,7 +581,7 @@ static void hvcs_try_write(struct hvcs_struct *hvcsd) | |||
581 | /* | 581 | /* |
582 | * We are still obligated to deliver the data to the | 582 | * We are still obligated to deliver the data to the |
583 | * hypervisor even if the tty has been closed because | 583 | * hypervisor even if the tty has been closed because |
584 | * we commited to delivering it. But don't try to wake | 584 | * we committed to delivering it. But don't try to wake |
585 | * a non-existent tty. | 585 | * a non-existent tty. |
586 | */ | 586 | */ |
587 | if (tty) { | 587 | if (tty) { |
@@ -1349,7 +1349,7 @@ static int hvcs_write(struct tty_struct *tty, | |||
1349 | spin_lock_irqsave(&hvcsd->lock, flags); | 1349 | spin_lock_irqsave(&hvcsd->lock, flags); |
1350 | 1350 | ||
1351 | /* | 1351 | /* |
1352 | * Somehow an open succedded but the device was removed or the | 1352 | * Somehow an open succeeded but the device was removed or the |
1353 | * connection terminated between the vty-server and partner vty during | 1353 | * connection terminated between the vty-server and partner vty during |
1354 | * the middle of a write operation? This is a crummy place to do this | 1354 | * the middle of a write operation? This is a crummy place to do this |
1355 | * but we want to keep it all in the spinlock. | 1355 | * but we want to keep it all in the spinlock. |
@@ -1420,7 +1420,7 @@ static int hvcs_write(struct tty_struct *tty, | |||
1420 | } | 1420 | } |
1421 | 1421 | ||
1422 | /* | 1422 | /* |
1423 | * This is really asking how much can we guarentee that we can send or that we | 1423 | * This is really asking how much can we guarantee that we can send or that we |
1424 | * absolutely WILL BUFFER if we can't send it. This driver MUST honor the | 1424 | * absolutely WILL BUFFER if we can't send it. This driver MUST honor the |
1425 | * return value, hence the reason for hvcs_struct buffering. | 1425 | * return value, hence the reason for hvcs_struct buffering. |
1426 | */ | 1426 | */ |
diff --git a/drivers/tty/mxser.h b/drivers/tty/mxser.h index 41878a69203d..0bf794313ffd 100644 --- a/drivers/tty/mxser.h +++ b/drivers/tty/mxser.h | |||
@@ -113,7 +113,7 @@ | |||
113 | #define MOXA_MUST_IIR_RTO 0x0C | 113 | #define MOXA_MUST_IIR_RTO 0x0C |
114 | #define MOXA_MUST_IIR_LSR 0x06 | 114 | #define MOXA_MUST_IIR_LSR 0x06 |
115 | 115 | ||
116 | /* recieved Xon/Xoff or specical interrupt pending */ | 116 | /* received Xon/Xoff or specical interrupt pending */ |
117 | #define MOXA_MUST_IIR_XSC 0x10 | 117 | #define MOXA_MUST_IIR_XSC 0x10 |
118 | 118 | ||
119 | /* RTS/CTS change state interrupt pending */ | 119 | /* RTS/CTS change state interrupt pending */ |
diff --git a/drivers/tty/n_gsm.c b/drivers/tty/n_gsm.c index 176f63256b37..47f8cdb207f1 100644 --- a/drivers/tty/n_gsm.c +++ b/drivers/tty/n_gsm.c | |||
@@ -74,7 +74,7 @@ module_param(debug, int, 0600); | |||
74 | #endif | 74 | #endif |
75 | 75 | ||
76 | /* | 76 | /* |
77 | * Semi-arbitary buffer size limits. 0710 is normally run with 32-64 byte | 77 | * Semi-arbitrary buffer size limits. 0710 is normally run with 32-64 byte |
78 | * limits so this is plenty | 78 | * limits so this is plenty |
79 | */ | 79 | */ |
80 | #define MAX_MRU 512 | 80 | #define MAX_MRU 512 |
@@ -82,7 +82,7 @@ module_param(debug, int, 0600); | |||
82 | 82 | ||
83 | /* | 83 | /* |
84 | * Each block of data we have queued to go out is in the form of | 84 | * Each block of data we have queued to go out is in the form of |
85 | * a gsm_msg which holds everything we need in a link layer independant | 85 | * a gsm_msg which holds everything we need in a link layer independent |
86 | * format | 86 | * format |
87 | */ | 87 | */ |
88 | 88 | ||
@@ -1193,8 +1193,8 @@ static void gsm_control_message(struct gsm_mux *gsm, unsigned int command, | |||
1193 | break; | 1193 | break; |
1194 | /* Optional unsupported commands */ | 1194 | /* Optional unsupported commands */ |
1195 | case CMD_PN: /* Parameter negotiation */ | 1195 | case CMD_PN: /* Parameter negotiation */ |
1196 | case CMD_RPN: /* Remote port negotation */ | 1196 | case CMD_RPN: /* Remote port negotiation */ |
1197 | case CMD_SNC: /* Service negotation command */ | 1197 | case CMD_SNC: /* Service negotiation command */ |
1198 | default: | 1198 | default: |
1199 | /* Reply to bad commands with an NSC */ | 1199 | /* Reply to bad commands with an NSC */ |
1200 | buf[0] = command; | 1200 | buf[0] = command; |
@@ -2026,7 +2026,7 @@ EXPORT_SYMBOL_GPL(gsm_activate_mux); | |||
2026 | * @mux: mux to free | 2026 | * @mux: mux to free |
2027 | * | 2027 | * |
2028 | * Dispose of allocated resources for a dead mux. No refcounting | 2028 | * Dispose of allocated resources for a dead mux. No refcounting |
2029 | * at present so the mux must be truely dead. | 2029 | * at present so the mux must be truly dead. |
2030 | */ | 2030 | */ |
2031 | void gsm_free_mux(struct gsm_mux *gsm) | 2031 | void gsm_free_mux(struct gsm_mux *gsm) |
2032 | { | 2032 | { |
diff --git a/drivers/tty/nozomi.c b/drivers/tty/nozomi.c index f4f11164efe5..fd0a98524d51 100644 --- a/drivers/tty/nozomi.c +++ b/drivers/tty/nozomi.c | |||
@@ -1673,7 +1673,7 @@ static void ntty_hangup(struct tty_struct *tty) | |||
1673 | 1673 | ||
1674 | /* | 1674 | /* |
1675 | * called when the userspace process writes to the tty (/dev/noz*). | 1675 | * called when the userspace process writes to the tty (/dev/noz*). |
1676 | * Data is inserted into a fifo, which is then read and transfered to the modem. | 1676 | * Data is inserted into a fifo, which is then read and transferred to the modem. |
1677 | */ | 1677 | */ |
1678 | static int ntty_write(struct tty_struct *tty, const unsigned char *buffer, | 1678 | static int ntty_write(struct tty_struct *tty, const unsigned char *buffer, |
1679 | int count) | 1679 | int count) |
diff --git a/drivers/tty/rocket.c b/drivers/tty/rocket.c index 3780da8ad12d..036feeb5e3f6 100644 --- a/drivers/tty/rocket.c +++ b/drivers/tty/rocket.c | |||
@@ -2060,7 +2060,7 @@ static __init int register_PCI(int i, struct pci_dev *dev) | |||
2060 | sClockPrescale = 0x19; | 2060 | sClockPrescale = 0x19; |
2061 | rp_baud_base[i] = 230400; | 2061 | rp_baud_base[i] = 230400; |
2062 | } else { | 2062 | } else { |
2063 | /* mod 4 (devide by 5) prescale */ | 2063 | /* mod 4 (divide by 5) prescale */ |
2064 | sClockPrescale = 0x14; | 2064 | sClockPrescale = 0x14; |
2065 | rp_baud_base[i] = 460800; | 2065 | rp_baud_base[i] = 460800; |
2066 | } | 2066 | } |
@@ -2183,7 +2183,7 @@ static int __init init_ISA(int i) | |||
2183 | sClockPrescale = 0x19; /* mod 9 (divide by 10) prescale */ | 2183 | sClockPrescale = 0x19; /* mod 9 (divide by 10) prescale */ |
2184 | rp_baud_base[i] = 230400; | 2184 | rp_baud_base[i] = 230400; |
2185 | } else { | 2185 | } else { |
2186 | sClockPrescale = 0x14; /* mod 4 (devide by 5) prescale */ | 2186 | sClockPrescale = 0x14; /* mod 4 (divide by 5) prescale */ |
2187 | rp_baud_base[i] = 460800; | 2187 | rp_baud_base[i] = 460800; |
2188 | } | 2188 | } |
2189 | 2189 | ||
diff --git a/drivers/tty/serial/8250.c b/drivers/tty/serial/8250.c index b3b881bc4712..6611535f4440 100644 --- a/drivers/tty/serial/8250.c +++ b/drivers/tty/serial/8250.c | |||
@@ -1629,7 +1629,7 @@ static irqreturn_t serial8250_interrupt(int irq, void *dev_id) | |||
1629 | up->port.iotype == UPIO_DWAPB32) && | 1629 | up->port.iotype == UPIO_DWAPB32) && |
1630 | (iir & UART_IIR_BUSY) == UART_IIR_BUSY) { | 1630 | (iir & UART_IIR_BUSY) == UART_IIR_BUSY) { |
1631 | /* The DesignWare APB UART has an Busy Detect (0x07) | 1631 | /* The DesignWare APB UART has an Busy Detect (0x07) |
1632 | * interrupt meaning an LCR write attempt occured while the | 1632 | * interrupt meaning an LCR write attempt occurred while the |
1633 | * UART was busy. The interrupt must be cleared by reading | 1633 | * UART was busy. The interrupt must be cleared by reading |
1634 | * the UART status register (USR) and the LCR re-written. */ | 1634 | * the UART status register (USR) and the LCR re-written. */ |
1635 | unsigned int status; | 1635 | unsigned int status; |
diff --git a/drivers/tty/serial/8250_pci.c b/drivers/tty/serial/8250_pci.c index 8b8930f700b5..738cec9807d3 100644 --- a/drivers/tty/serial/8250_pci.c +++ b/drivers/tty/serial/8250_pci.c | |||
@@ -433,7 +433,7 @@ static void __devexit sbs_exit(struct pci_dev *dev) | |||
433 | /* | 433 | /* |
434 | * SIIG serial cards have an PCI interface chip which also controls | 434 | * SIIG serial cards have an PCI interface chip which also controls |
435 | * the UART clocking frequency. Each UART can be clocked independently | 435 | * the UART clocking frequency. Each UART can be clocked independently |
436 | * (except cards equiped with 4 UARTs) and initial clocking settings | 436 | * (except cards equipped with 4 UARTs) and initial clocking settings |
437 | * are stored in the EEPROM chip. It can cause problems because this | 437 | * are stored in the EEPROM chip. It can cause problems because this |
438 | * version of serial driver doesn't support differently clocked UART's | 438 | * version of serial driver doesn't support differently clocked UART's |
439 | * on single PCI card. To prevent this, initialization functions set | 439 | * on single PCI card. To prevent this, initialization functions set |
diff --git a/drivers/tty/serial/amba-pl011.c b/drivers/tty/serial/amba-pl011.c index 57731e870085..6deee4e546be 100644 --- a/drivers/tty/serial/amba-pl011.c +++ b/drivers/tty/serial/amba-pl011.c | |||
@@ -520,7 +520,7 @@ static bool pl011_dma_tx_irq(struct uart_amba_port *uap) | |||
520 | 520 | ||
521 | /* | 521 | /* |
522 | * We don't have a TX buffer queued, so try to queue one. | 522 | * We don't have a TX buffer queued, so try to queue one. |
523 | * If we succesfully queued a buffer, mask the TX IRQ. | 523 | * If we successfully queued a buffer, mask the TX IRQ. |
524 | */ | 524 | */ |
525 | if (pl011_dma_tx_refill(uap) > 0) { | 525 | if (pl011_dma_tx_refill(uap) > 0) { |
526 | uap->im &= ~UART011_TXIM; | 526 | uap->im &= ~UART011_TXIM; |
diff --git a/drivers/tty/serial/icom.c b/drivers/tty/serial/icom.c index 53a468227056..8a869e58f6d7 100644 --- a/drivers/tty/serial/icom.c +++ b/drivers/tty/serial/icom.c | |||
@@ -1248,7 +1248,7 @@ static void icom_set_termios(struct uart_port *port, | |||
1248 | } | 1248 | } |
1249 | } | 1249 | } |
1250 | 1250 | ||
1251 | /* Enable Transmitter and Reciever */ | 1251 | /* Enable Transmitter and Receiver */ |
1252 | offset = | 1252 | offset = |
1253 | (unsigned long) &ICOM_PORT->statStg->rcv[0] - | 1253 | (unsigned long) &ICOM_PORT->statStg->rcv[0] - |
1254 | (unsigned long) ICOM_PORT->statStg; | 1254 | (unsigned long) ICOM_PORT->statStg; |
diff --git a/drivers/tty/serial/imx.c b/drivers/tty/serial/imx.c index dfcf4b1878aa..cb36b0d4ef3c 100644 --- a/drivers/tty/serial/imx.c +++ b/drivers/tty/serial/imx.c | |||
@@ -78,7 +78,7 @@ | |||
78 | #define URXD_FRMERR (1<<12) | 78 | #define URXD_FRMERR (1<<12) |
79 | #define URXD_BRK (1<<11) | 79 | #define URXD_BRK (1<<11) |
80 | #define URXD_PRERR (1<<10) | 80 | #define URXD_PRERR (1<<10) |
81 | #define UCR1_ADEN (1<<15) /* Auto dectect interrupt */ | 81 | #define UCR1_ADEN (1<<15) /* Auto detect interrupt */ |
82 | #define UCR1_ADBR (1<<14) /* Auto detect baud rate */ | 82 | #define UCR1_ADBR (1<<14) /* Auto detect baud rate */ |
83 | #define UCR1_TRDYEN (1<<13) /* Transmitter ready interrupt enable */ | 83 | #define UCR1_TRDYEN (1<<13) /* Transmitter ready interrupt enable */ |
84 | #define UCR1_IDEN (1<<12) /* Idle condition interrupt */ | 84 | #define UCR1_IDEN (1<<12) /* Idle condition interrupt */ |
diff --git a/drivers/tty/serial/ip22zilog.c b/drivers/tty/serial/ip22zilog.c index ebff4a1d4bcc..7b1cda59ebb5 100644 --- a/drivers/tty/serial/ip22zilog.c +++ b/drivers/tty/serial/ip22zilog.c | |||
@@ -375,7 +375,7 @@ static void ip22zilog_transmit_chars(struct uart_ip22zilog_port *up, | |||
375 | * be nice to transmit console writes just like we normally would for | 375 | * be nice to transmit console writes just like we normally would for |
376 | * a TTY line. (ie. buffered and TX interrupt driven). That is not | 376 | * a TTY line. (ie. buffered and TX interrupt driven). That is not |
377 | * easy because console writes cannot sleep. One solution might be | 377 | * easy because console writes cannot sleep. One solution might be |
378 | * to poll on enough port->xmit space becomming free. -DaveM | 378 | * to poll on enough port->xmit space becoming free. -DaveM |
379 | */ | 379 | */ |
380 | if (!(status & Tx_BUF_EMP)) | 380 | if (!(status & Tx_BUF_EMP)) |
381 | return; | 381 | return; |
diff --git a/drivers/tty/serial/jsm/jsm.h b/drivers/tty/serial/jsm/jsm.h index 38a509c684cd..b704c8ce0d71 100644 --- a/drivers/tty/serial/jsm/jsm.h +++ b/drivers/tty/serial/jsm/jsm.h | |||
@@ -273,7 +273,7 @@ struct neo_uart_struct { | |||
273 | u8 fctr; /* WR FCTR - Feature Control Reg */ | 273 | u8 fctr; /* WR FCTR - Feature Control Reg */ |
274 | u8 efr; /* WR EFR - Enhanced Function Reg */ | 274 | u8 efr; /* WR EFR - Enhanced Function Reg */ |
275 | u8 tfifo; /* WR TXCNT/TXTRG - Transmit FIFO Reg */ | 275 | u8 tfifo; /* WR TXCNT/TXTRG - Transmit FIFO Reg */ |
276 | u8 rfifo; /* WR RXCNT/RXTRG - Recieve FIFO Reg */ | 276 | u8 rfifo; /* WR RXCNT/RXTRG - Receive FIFO Reg */ |
277 | u8 xoffchar1; /* WR XOFF 1 - XOff Character 1 Reg */ | 277 | u8 xoffchar1; /* WR XOFF 1 - XOff Character 1 Reg */ |
278 | u8 xoffchar2; /* WR XOFF 2 - XOff Character 2 Reg */ | 278 | u8 xoffchar2; /* WR XOFF 2 - XOff Character 2 Reg */ |
279 | u8 xonchar1; /* WR XON 1 - Xon Character 1 Reg */ | 279 | u8 xonchar1; /* WR XON 1 - Xon Character 1 Reg */ |
diff --git a/drivers/tty/serial/jsm/jsm_neo.c b/drivers/tty/serial/jsm/jsm_neo.c index 7960d9633c15..4538c3e3646e 100644 --- a/drivers/tty/serial/jsm/jsm_neo.c +++ b/drivers/tty/serial/jsm/jsm_neo.c | |||
@@ -381,7 +381,7 @@ static void neo_copy_data_from_uart_to_queue(struct jsm_channel *ch) | |||
381 | /* Copy data from uart to the queue */ | 381 | /* Copy data from uart to the queue */ |
382 | memcpy_fromio(ch->ch_rqueue + head, &ch->ch_neo_uart->txrxburst, n); | 382 | memcpy_fromio(ch->ch_rqueue + head, &ch->ch_neo_uart->txrxburst, n); |
383 | /* | 383 | /* |
384 | * Since RX_FIFO_DATA_ERROR was 0, we are guarenteed | 384 | * Since RX_FIFO_DATA_ERROR was 0, we are guaranteed |
385 | * that all the data currently in the FIFO is free of | 385 | * that all the data currently in the FIFO is free of |
386 | * breaks and parity/frame/orun errors. | 386 | * breaks and parity/frame/orun errors. |
387 | */ | 387 | */ |
@@ -1210,7 +1210,7 @@ static irqreturn_t neo_intr(int irq, void *voidbrd) | |||
1210 | * Why would I check EVERY possibility of type of | 1210 | * Why would I check EVERY possibility of type of |
1211 | * interrupt, when we know its TXRDY??? | 1211 | * interrupt, when we know its TXRDY??? |
1212 | * Becuz for some reason, even tho we got triggered for TXRDY, | 1212 | * Becuz for some reason, even tho we got triggered for TXRDY, |
1213 | * it seems to be occassionally wrong. Instead of TX, which | 1213 | * it seems to be occasionally wrong. Instead of TX, which |
1214 | * it should be, I was getting things like RXDY too. Weird. | 1214 | * it should be, I was getting things like RXDY too. Weird. |
1215 | */ | 1215 | */ |
1216 | neo_parse_isr(brd, port); | 1216 | neo_parse_isr(brd, port); |
diff --git a/drivers/tty/serial/max3107.h b/drivers/tty/serial/max3107.h index 7ab632392502..8415fc723b96 100644 --- a/drivers/tty/serial/max3107.h +++ b/drivers/tty/serial/max3107.h | |||
@@ -369,7 +369,7 @@ struct max3107_port { | |||
369 | struct spi_device *spi; | 369 | struct spi_device *spi; |
370 | 370 | ||
371 | #if defined(CONFIG_GPIOLIB) | 371 | #if defined(CONFIG_GPIOLIB) |
372 | /* GPIO chip stucture */ | 372 | /* GPIO chip structure */ |
373 | struct gpio_chip chip; | 373 | struct gpio_chip chip; |
374 | #endif | 374 | #endif |
375 | 375 | ||
diff --git a/drivers/tty/serial/mrst_max3110.c b/drivers/tty/serial/mrst_max3110.c index 37e13c3d91d9..2f548af4e98a 100644 --- a/drivers/tty/serial/mrst_max3110.c +++ b/drivers/tty/serial/mrst_max3110.c | |||
@@ -23,7 +23,7 @@ | |||
23 | * 1 word. If SPI master controller doesn't support sclk frequency change, | 23 | * 1 word. If SPI master controller doesn't support sclk frequency change, |
24 | * then the char need be sent out one by one with some delay | 24 | * then the char need be sent out one by one with some delay |
25 | * | 25 | * |
26 | * 2. Currently only RX availabe interrrupt is used, no need for waiting TXE | 26 | * 2. Currently only RX available interrrupt is used, no need for waiting TXE |
27 | * interrupt for a low speed UART device | 27 | * interrupt for a low speed UART device |
28 | */ | 28 | */ |
29 | 29 | ||
diff --git a/drivers/tty/serial/mrst_max3110.h b/drivers/tty/serial/mrst_max3110.h index d1ef43af397c..c37ea48c825a 100644 --- a/drivers/tty/serial/mrst_max3110.h +++ b/drivers/tty/serial/mrst_max3110.h | |||
@@ -21,7 +21,7 @@ | |||
21 | 21 | ||
22 | #define WC_IRQ_MASK (0xF << 8) | 22 | #define WC_IRQ_MASK (0xF << 8) |
23 | #define WC_TXE_IRQ_ENABLE (1 << 11) /* TX empty irq */ | 23 | #define WC_TXE_IRQ_ENABLE (1 << 11) /* TX empty irq */ |
24 | #define WC_RXA_IRQ_ENABLE (1 << 10) /* RX availabe irq */ | 24 | #define WC_RXA_IRQ_ENABLE (1 << 10) /* RX available irq */ |
25 | #define WC_PAR_HIGH_IRQ_ENABLE (1 << 9) | 25 | #define WC_PAR_HIGH_IRQ_ENABLE (1 << 9) |
26 | #define WC_REC_ACT_IRQ_ENABLE (1 << 8) | 26 | #define WC_REC_ACT_IRQ_ENABLE (1 << 8) |
27 | 27 | ||
diff --git a/drivers/tty/serial/msm_serial_hs.c b/drivers/tty/serial/msm_serial_hs.c index b906f11f7c1a..624701f8138a 100644 --- a/drivers/tty/serial/msm_serial_hs.c +++ b/drivers/tty/serial/msm_serial_hs.c | |||
@@ -495,7 +495,7 @@ static void msm_hs_pm(struct uart_port *uport, unsigned int state, | |||
495 | * | 495 | * |
496 | * Interrupts should be disabled before we are called, as | 496 | * Interrupts should be disabled before we are called, as |
497 | * we modify Set Baud rate | 497 | * we modify Set Baud rate |
498 | * Set receive stale interrupt level, dependant on Bit Rate | 498 | * Set receive stale interrupt level, dependent on Bit Rate |
499 | * Goal is to have around 8 ms before indicate stale. | 499 | * Goal is to have around 8 ms before indicate stale. |
500 | * roundup (((Bit Rate * .008) / 10) + 1 | 500 | * roundup (((Bit Rate * .008) / 10) + 1 |
501 | */ | 501 | */ |
@@ -1350,7 +1350,7 @@ static irqreturn_t msm_hs_rx_wakeup_isr(int irq, void *dev) | |||
1350 | 1350 | ||
1351 | spin_lock_irqsave(&uport->lock, flags); | 1351 | spin_lock_irqsave(&uport->lock, flags); |
1352 | if (msm_uport->clk_state == MSM_HS_CLK_OFF) { | 1352 | if (msm_uport->clk_state == MSM_HS_CLK_OFF) { |
1353 | /* ignore the first irq - it is a pending irq that occured | 1353 | /* ignore the first irq - it is a pending irq that occurred |
1354 | * before enable_irq() */ | 1354 | * before enable_irq() */ |
1355 | if (msm_uport->rx_wakeup.ignore) | 1355 | if (msm_uport->rx_wakeup.ignore) |
1356 | msm_uport->rx_wakeup.ignore = 0; | 1356 | msm_uport->rx_wakeup.ignore = 0; |
diff --git a/drivers/tty/serial/omap-serial.c b/drivers/tty/serial/omap-serial.c index 763537943a53..47cadf474149 100644 --- a/drivers/tty/serial/omap-serial.c +++ b/drivers/tty/serial/omap-serial.c | |||
@@ -13,7 +13,7 @@ | |||
13 | * the Free Software Foundation; either version 2 of the License, or | 13 | * the Free Software Foundation; either version 2 of the License, or |
14 | * (at your option) any later version. | 14 | * (at your option) any later version. |
15 | * | 15 | * |
16 | * Note: This driver is made seperate from 8250 driver as we cannot | 16 | * Note: This driver is made separate from 8250 driver as we cannot |
17 | * over load 8250 driver with omap platform specific configuration for | 17 | * over load 8250 driver with omap platform specific configuration for |
18 | * features like DMA, it makes easier to implement features like DMA and | 18 | * features like DMA, it makes easier to implement features like DMA and |
19 | * hardware flow control and software flow control configuration with | 19 | * hardware flow control and software flow control configuration with |
diff --git a/drivers/tty/serial/pmac_zilog.c b/drivers/tty/serial/pmac_zilog.c index 5b9cde79e4ea..e1c8d4f1ce58 100644 --- a/drivers/tty/serial/pmac_zilog.c +++ b/drivers/tty/serial/pmac_zilog.c | |||
@@ -330,7 +330,7 @@ static struct tty_struct *pmz_receive_chars(struct uart_pmac_port *uap) | |||
330 | * When that happens, I disable the receive side of the driver. | 330 | * When that happens, I disable the receive side of the driver. |
331 | * Note that what I've been experiencing is a real irq loop where | 331 | * Note that what I've been experiencing is a real irq loop where |
332 | * I'm getting flooded regardless of the actual port speed. | 332 | * I'm getting flooded regardless of the actual port speed. |
333 | * Something stange is going on with the HW | 333 | * Something strange is going on with the HW |
334 | */ | 334 | */ |
335 | if ((++loops) > 1000) | 335 | if ((++loops) > 1000) |
336 | goto flood; | 336 | goto flood; |
@@ -396,7 +396,7 @@ static void pmz_transmit_chars(struct uart_pmac_port *uap) | |||
396 | * be nice to transmit console writes just like we normally would for | 396 | * be nice to transmit console writes just like we normally would for |
397 | * a TTY line. (ie. buffered and TX interrupt driven). That is not | 397 | * a TTY line. (ie. buffered and TX interrupt driven). That is not |
398 | * easy because console writes cannot sleep. One solution might be | 398 | * easy because console writes cannot sleep. One solution might be |
399 | * to poll on enough port->xmit space becomming free. -DaveM | 399 | * to poll on enough port->xmit space becoming free. -DaveM |
400 | */ | 400 | */ |
401 | if (!(status & Tx_BUF_EMP)) | 401 | if (!(status & Tx_BUF_EMP)) |
402 | return; | 402 | return; |
@@ -809,7 +809,7 @@ static int pmz_set_scc_power(struct uart_pmac_port *uap, int state) | |||
809 | #endif /* !CONFIG_PPC_PMAC */ | 809 | #endif /* !CONFIG_PPC_PMAC */ |
810 | 810 | ||
811 | /* | 811 | /* |
812 | * FixZeroBug....Works around a bug in the SCC receving channel. | 812 | * FixZeroBug....Works around a bug in the SCC receiving channel. |
813 | * Inspired from Darwin code, 15 Sept. 2000 -DanM | 813 | * Inspired from Darwin code, 15 Sept. 2000 -DanM |
814 | * | 814 | * |
815 | * The following sequence prevents a problem that is seen with O'Hare ASICs | 815 | * The following sequence prevents a problem that is seen with O'Hare ASICs |
diff --git a/drivers/tty/serial/samsung.c b/drivers/tty/serial/samsung.c index 2335edafe903..9e2fa8d784e2 100644 --- a/drivers/tty/serial/samsung.c +++ b/drivers/tty/serial/samsung.c | |||
@@ -64,7 +64,7 @@ | |||
64 | #define tx_enabled(port) ((port)->unused[0]) | 64 | #define tx_enabled(port) ((port)->unused[0]) |
65 | #define rx_enabled(port) ((port)->unused[1]) | 65 | #define rx_enabled(port) ((port)->unused[1]) |
66 | 66 | ||
67 | /* flag to ignore all characters comming in */ | 67 | /* flag to ignore all characters coming in */ |
68 | #define RXSTAT_DUMMY_READ (0x10000000) | 68 | #define RXSTAT_DUMMY_READ (0x10000000) |
69 | 69 | ||
70 | static inline struct s3c24xx_uart_port *to_ourport(struct uart_port *port) | 70 | static inline struct s3c24xx_uart_port *to_ourport(struct uart_port *port) |
@@ -291,7 +291,7 @@ static irqreturn_t s3c24xx_serial_tx_chars(int irq, void *id) | |||
291 | goto out; | 291 | goto out; |
292 | } | 292 | } |
293 | 293 | ||
294 | /* if there isnt anything more to transmit, or the uart is now | 294 | /* if there isn't anything more to transmit, or the uart is now |
295 | * stopped, disable the uart and exit | 295 | * stopped, disable the uart and exit |
296 | */ | 296 | */ |
297 | 297 | ||
diff --git a/drivers/tty/serial/sh-sci.c b/drivers/tty/serial/sh-sci.c index eb7958c675a8..a7b083f4ea78 100644 --- a/drivers/tty/serial/sh-sci.c +++ b/drivers/tty/serial/sh-sci.c | |||
@@ -812,7 +812,7 @@ static irqreturn_t sci_mpxed_interrupt(int irq, void *ptr) | |||
812 | } | 812 | } |
813 | 813 | ||
814 | /* | 814 | /* |
815 | * Here we define a transistion notifier so that we can update all of our | 815 | * Here we define a transition notifier so that we can update all of our |
816 | * ports' baud rate when the peripheral clock changes. | 816 | * ports' baud rate when the peripheral clock changes. |
817 | */ | 817 | */ |
818 | static int sci_notifier(struct notifier_block *self, | 818 | static int sci_notifier(struct notifier_block *self, |
diff --git a/drivers/tty/serial/sn_console.c b/drivers/tty/serial/sn_console.c index cff9a306660f..377ae74e7154 100644 --- a/drivers/tty/serial/sn_console.c +++ b/drivers/tty/serial/sn_console.c | |||
@@ -146,7 +146,7 @@ static struct sn_sal_ops intr_ops = { | |||
146 | }; | 146 | }; |
147 | 147 | ||
148 | /* the console does output in two distinctly different ways: | 148 | /* the console does output in two distinctly different ways: |
149 | * synchronous (raw) and asynchronous (buffered). initally, early_printk | 149 | * synchronous (raw) and asynchronous (buffered). initially, early_printk |
150 | * does synchronous output. any data written goes directly to the SAL | 150 | * does synchronous output. any data written goes directly to the SAL |
151 | * to be output (incidentally, it is internally buffered by the SAL) | 151 | * to be output (incidentally, it is internally buffered by the SAL) |
152 | * after interrupts and timers are initialized and available for use, | 152 | * after interrupts and timers are initialized and available for use, |
@@ -481,7 +481,7 @@ sn_receive_chars(struct sn_cons_port *port, unsigned long flags) | |||
481 | while (port->sc_ops->sal_input_pending()) { | 481 | while (port->sc_ops->sal_input_pending()) { |
482 | ch = port->sc_ops->sal_getc(); | 482 | ch = port->sc_ops->sal_getc(); |
483 | if (ch < 0) { | 483 | if (ch < 0) { |
484 | printk(KERN_ERR "sn_console: An error occured while " | 484 | printk(KERN_ERR "sn_console: An error occurred while " |
485 | "obtaining data from the console (0x%0x)\n", ch); | 485 | "obtaining data from the console (0x%0x)\n", ch); |
486 | break; | 486 | break; |
487 | } | 487 | } |
diff --git a/drivers/tty/serial/sunzilog.c b/drivers/tty/serial/sunzilog.c index 99ff9abf57ce..8e916e76b7b5 100644 --- a/drivers/tty/serial/sunzilog.c +++ b/drivers/tty/serial/sunzilog.c | |||
@@ -474,7 +474,7 @@ static void sunzilog_transmit_chars(struct uart_sunzilog_port *up, | |||
474 | * be nice to transmit console writes just like we normally would for | 474 | * be nice to transmit console writes just like we normally would for |
475 | * a TTY line. (ie. buffered and TX interrupt driven). That is not | 475 | * a TTY line. (ie. buffered and TX interrupt driven). That is not |
476 | * easy because console writes cannot sleep. One solution might be | 476 | * easy because console writes cannot sleep. One solution might be |
477 | * to poll on enough port->xmit space becomming free. -DaveM | 477 | * to poll on enough port->xmit space becoming free. -DaveM |
478 | */ | 478 | */ |
479 | if (!(status & Tx_BUF_EMP)) | 479 | if (!(status & Tx_BUF_EMP)) |
480 | return; | 480 | return; |
diff --git a/drivers/tty/synclink.c b/drivers/tty/synclink.c index 18888d005a0a..27da23d98e3f 100644 --- a/drivers/tty/synclink.c +++ b/drivers/tty/synclink.c | |||
@@ -4072,7 +4072,7 @@ static int mgsl_claim_resources(struct mgsl_struct *info) | |||
4072 | 4072 | ||
4073 | if ( request_irq(info->irq_level,mgsl_interrupt,info->irq_flags, | 4073 | if ( request_irq(info->irq_level,mgsl_interrupt,info->irq_flags, |
4074 | info->device_name, info ) < 0 ) { | 4074 | info->device_name, info ) < 0 ) { |
4075 | printk( "%s(%d):Cant request interrupt on device %s IRQ=%d\n", | 4075 | printk( "%s(%d):Can't request interrupt on device %s IRQ=%d\n", |
4076 | __FILE__,__LINE__,info->device_name, info->irq_level ); | 4076 | __FILE__,__LINE__,info->device_name, info->irq_level ); |
4077 | goto errout; | 4077 | goto errout; |
4078 | } | 4078 | } |
@@ -4095,7 +4095,7 @@ static int mgsl_claim_resources(struct mgsl_struct *info) | |||
4095 | info->memory_base = ioremap_nocache(info->phys_memory_base, | 4095 | info->memory_base = ioremap_nocache(info->phys_memory_base, |
4096 | 0x40000); | 4096 | 0x40000); |
4097 | if (!info->memory_base) { | 4097 | if (!info->memory_base) { |
4098 | printk( "%s(%d):Cant map shared memory on device %s MemAddr=%08X\n", | 4098 | printk( "%s(%d):Can't map shared memory on device %s MemAddr=%08X\n", |
4099 | __FILE__,__LINE__,info->device_name, info->phys_memory_base ); | 4099 | __FILE__,__LINE__,info->device_name, info->phys_memory_base ); |
4100 | goto errout; | 4100 | goto errout; |
4101 | } | 4101 | } |
@@ -4109,7 +4109,7 @@ static int mgsl_claim_resources(struct mgsl_struct *info) | |||
4109 | info->lcr_base = ioremap_nocache(info->phys_lcr_base, | 4109 | info->lcr_base = ioremap_nocache(info->phys_lcr_base, |
4110 | PAGE_SIZE); | 4110 | PAGE_SIZE); |
4111 | if (!info->lcr_base) { | 4111 | if (!info->lcr_base) { |
4112 | printk( "%s(%d):Cant map LCR memory on device %s MemAddr=%08X\n", | 4112 | printk( "%s(%d):Can't map LCR memory on device %s MemAddr=%08X\n", |
4113 | __FILE__,__LINE__,info->device_name, info->phys_lcr_base ); | 4113 | __FILE__,__LINE__,info->device_name, info->phys_lcr_base ); |
4114 | goto errout; | 4114 | goto errout; |
4115 | } | 4115 | } |
@@ -4119,7 +4119,7 @@ static int mgsl_claim_resources(struct mgsl_struct *info) | |||
4119 | /* claim DMA channel */ | 4119 | /* claim DMA channel */ |
4120 | 4120 | ||
4121 | if (request_dma(info->dma_level,info->device_name) < 0){ | 4121 | if (request_dma(info->dma_level,info->device_name) < 0){ |
4122 | printk( "%s(%d):Cant request DMA channel on device %s DMA=%d\n", | 4122 | printk( "%s(%d):Can't request DMA channel on device %s DMA=%d\n", |
4123 | __FILE__,__LINE__,info->device_name, info->dma_level ); | 4123 | __FILE__,__LINE__,info->device_name, info->dma_level ); |
4124 | mgsl_release_resources( info ); | 4124 | mgsl_release_resources( info ); |
4125 | return -ENODEV; | 4125 | return -ENODEV; |
@@ -4132,7 +4132,7 @@ static int mgsl_claim_resources(struct mgsl_struct *info) | |||
4132 | } | 4132 | } |
4133 | 4133 | ||
4134 | if ( mgsl_allocate_dma_buffers(info) < 0 ) { | 4134 | if ( mgsl_allocate_dma_buffers(info) < 0 ) { |
4135 | printk( "%s(%d):Cant allocate DMA buffers on device %s DMA=%d\n", | 4135 | printk( "%s(%d):Can't allocate DMA buffers on device %s DMA=%d\n", |
4136 | __FILE__,__LINE__,info->device_name, info->dma_level ); | 4136 | __FILE__,__LINE__,info->device_name, info->dma_level ); |
4137 | goto errout; | 4137 | goto errout; |
4138 | } | 4138 | } |
diff --git a/drivers/tty/synclink_gt.c b/drivers/tty/synclink_gt.c index a35dd549a008..18b48cd3b41d 100644 --- a/drivers/tty/synclink_gt.c +++ b/drivers/tty/synclink_gt.c | |||
@@ -3491,7 +3491,7 @@ static int claim_resources(struct slgt_info *info) | |||
3491 | 3491 | ||
3492 | info->reg_addr = ioremap_nocache(info->phys_reg_addr, SLGT_REG_SIZE); | 3492 | info->reg_addr = ioremap_nocache(info->phys_reg_addr, SLGT_REG_SIZE); |
3493 | if (!info->reg_addr) { | 3493 | if (!info->reg_addr) { |
3494 | DBGERR(("%s cant map device registers, addr=%08X\n", | 3494 | DBGERR(("%s can't map device registers, addr=%08X\n", |
3495 | info->device_name, info->phys_reg_addr)); | 3495 | info->device_name, info->phys_reg_addr)); |
3496 | info->init_error = DiagStatus_CantAssignPciResources; | 3496 | info->init_error = DiagStatus_CantAssignPciResources; |
3497 | goto errout; | 3497 | goto errout; |
diff --git a/drivers/tty/synclinkmp.c b/drivers/tty/synclinkmp.c index 327343694473..c77831c7675a 100644 --- a/drivers/tty/synclinkmp.c +++ b/drivers/tty/synclinkmp.c | |||
@@ -3595,7 +3595,7 @@ static int claim_resources(SLMP_INFO *info) | |||
3595 | info->memory_base = ioremap_nocache(info->phys_memory_base, | 3595 | info->memory_base = ioremap_nocache(info->phys_memory_base, |
3596 | SCA_MEM_SIZE); | 3596 | SCA_MEM_SIZE); |
3597 | if (!info->memory_base) { | 3597 | if (!info->memory_base) { |
3598 | printk( "%s(%d):%s Cant map shared memory, MemAddr=%08X\n", | 3598 | printk( "%s(%d):%s Can't map shared memory, MemAddr=%08X\n", |
3599 | __FILE__,__LINE__,info->device_name, info->phys_memory_base ); | 3599 | __FILE__,__LINE__,info->device_name, info->phys_memory_base ); |
3600 | info->init_error = DiagStatus_CantAssignPciResources; | 3600 | info->init_error = DiagStatus_CantAssignPciResources; |
3601 | goto errout; | 3601 | goto errout; |
@@ -3603,7 +3603,7 @@ static int claim_resources(SLMP_INFO *info) | |||
3603 | 3603 | ||
3604 | info->lcr_base = ioremap_nocache(info->phys_lcr_base, PAGE_SIZE); | 3604 | info->lcr_base = ioremap_nocache(info->phys_lcr_base, PAGE_SIZE); |
3605 | if (!info->lcr_base) { | 3605 | if (!info->lcr_base) { |
3606 | printk( "%s(%d):%s Cant map LCR memory, MemAddr=%08X\n", | 3606 | printk( "%s(%d):%s Can't map LCR memory, MemAddr=%08X\n", |
3607 | __FILE__,__LINE__,info->device_name, info->phys_lcr_base ); | 3607 | __FILE__,__LINE__,info->device_name, info->phys_lcr_base ); |
3608 | info->init_error = DiagStatus_CantAssignPciResources; | 3608 | info->init_error = DiagStatus_CantAssignPciResources; |
3609 | goto errout; | 3609 | goto errout; |
@@ -3612,7 +3612,7 @@ static int claim_resources(SLMP_INFO *info) | |||
3612 | 3612 | ||
3613 | info->sca_base = ioremap_nocache(info->phys_sca_base, PAGE_SIZE); | 3613 | info->sca_base = ioremap_nocache(info->phys_sca_base, PAGE_SIZE); |
3614 | if (!info->sca_base) { | 3614 | if (!info->sca_base) { |
3615 | printk( "%s(%d):%s Cant map SCA memory, MemAddr=%08X\n", | 3615 | printk( "%s(%d):%s Can't map SCA memory, MemAddr=%08X\n", |
3616 | __FILE__,__LINE__,info->device_name, info->phys_sca_base ); | 3616 | __FILE__,__LINE__,info->device_name, info->phys_sca_base ); |
3617 | info->init_error = DiagStatus_CantAssignPciResources; | 3617 | info->init_error = DiagStatus_CantAssignPciResources; |
3618 | goto errout; | 3618 | goto errout; |
@@ -3622,7 +3622,7 @@ static int claim_resources(SLMP_INFO *info) | |||
3622 | info->statctrl_base = ioremap_nocache(info->phys_statctrl_base, | 3622 | info->statctrl_base = ioremap_nocache(info->phys_statctrl_base, |
3623 | PAGE_SIZE); | 3623 | PAGE_SIZE); |
3624 | if (!info->statctrl_base) { | 3624 | if (!info->statctrl_base) { |
3625 | printk( "%s(%d):%s Cant map SCA Status/Control memory, MemAddr=%08X\n", | 3625 | printk( "%s(%d):%s Can't map SCA Status/Control memory, MemAddr=%08X\n", |
3626 | __FILE__,__LINE__,info->device_name, info->phys_statctrl_base ); | 3626 | __FILE__,__LINE__,info->device_name, info->phys_statctrl_base ); |
3627 | info->init_error = DiagStatus_CantAssignPciResources; | 3627 | info->init_error = DiagStatus_CantAssignPciResources; |
3628 | goto errout; | 3628 | goto errout; |
@@ -3869,7 +3869,7 @@ static void device_init(int adapter_num, struct pci_dev *pdev) | |||
3869 | port_array[0]->irq_flags, | 3869 | port_array[0]->irq_flags, |
3870 | port_array[0]->device_name, | 3870 | port_array[0]->device_name, |
3871 | port_array[0]) < 0 ) { | 3871 | port_array[0]) < 0 ) { |
3872 | printk( "%s(%d):%s Cant request interrupt, IRQ=%d\n", | 3872 | printk( "%s(%d):%s Can't request interrupt, IRQ=%d\n", |
3873 | __FILE__,__LINE__, | 3873 | __FILE__,__LINE__, |
3874 | port_array[0]->device_name, | 3874 | port_array[0]->device_name, |
3875 | port_array[0]->irq_level ); | 3875 | port_array[0]->irq_level ); |
diff --git a/drivers/tty/tty_io.c b/drivers/tty/tty_io.c index 936a4ead6c21..d7d50b48287e 100644 --- a/drivers/tty/tty_io.c +++ b/drivers/tty/tty_io.c | |||
@@ -2134,7 +2134,7 @@ done: | |||
2134 | * actually has driver level meaning and triggers a VC resize. | 2134 | * actually has driver level meaning and triggers a VC resize. |
2135 | * | 2135 | * |
2136 | * Locking: | 2136 | * Locking: |
2137 | * Driver dependant. The default do_resize method takes the | 2137 | * Driver dependent. The default do_resize method takes the |
2138 | * tty termios mutex and ctrl_lock. The console takes its own lock | 2138 | * tty termios mutex and ctrl_lock. The console takes its own lock |
2139 | * then calls into the default method. | 2139 | * then calls into the default method. |
2140 | */ | 2140 | */ |
@@ -2155,7 +2155,7 @@ static int tiocswinsz(struct tty_struct *tty, struct winsize __user *arg) | |||
2155 | * tioccons - allow admin to move logical console | 2155 | * tioccons - allow admin to move logical console |
2156 | * @file: the file to become console | 2156 | * @file: the file to become console |
2157 | * | 2157 | * |
2158 | * Allow the adminstrator to move the redirected console device | 2158 | * Allow the administrator to move the redirected console device |
2159 | * | 2159 | * |
2160 | * Locking: uses redirect_lock to guard the redirect information | 2160 | * Locking: uses redirect_lock to guard the redirect information |
2161 | */ | 2161 | */ |
@@ -2290,7 +2290,7 @@ EXPORT_SYMBOL_GPL(tty_get_pgrp); | |||
2290 | /** | 2290 | /** |
2291 | * tiocgpgrp - get process group | 2291 | * tiocgpgrp - get process group |
2292 | * @tty: tty passed by user | 2292 | * @tty: tty passed by user |
2293 | * @real_tty: tty side of the tty pased by the user if a pty else the tty | 2293 | * @real_tty: tty side of the tty passed by the user if a pty else the tty |
2294 | * @p: returned pid | 2294 | * @p: returned pid |
2295 | * | 2295 | * |
2296 | * Obtain the process group of the tty. If there is no process group | 2296 | * Obtain the process group of the tty. If there is no process group |
@@ -2367,7 +2367,7 @@ out_unlock: | |||
2367 | /** | 2367 | /** |
2368 | * tiocgsid - get session id | 2368 | * tiocgsid - get session id |
2369 | * @tty: tty passed by user | 2369 | * @tty: tty passed by user |
2370 | * @real_tty: tty side of the tty pased by the user if a pty else the tty | 2370 | * @real_tty: tty side of the tty passed by the user if a pty else the tty |
2371 | * @p: pointer to returned session id | 2371 | * @p: pointer to returned session id |
2372 | * | 2372 | * |
2373 | * Obtain the session id of the tty. If there is no session | 2373 | * Obtain the session id of the tty. If there is no session |
diff --git a/drivers/tty/tty_ioctl.c b/drivers/tty/tty_ioctl.c index 1a1135d580a2..21574cb32343 100644 --- a/drivers/tty/tty_ioctl.c +++ b/drivers/tty/tty_ioctl.c | |||
@@ -247,7 +247,7 @@ speed_t tty_termios_baud_rate(struct ktermios *termios) | |||
247 | cbaud = termios->c_cflag & CBAUD; | 247 | cbaud = termios->c_cflag & CBAUD; |
248 | 248 | ||
249 | #ifdef BOTHER | 249 | #ifdef BOTHER |
250 | /* Magic token for arbitary speed via c_ispeed/c_ospeed */ | 250 | /* Magic token for arbitrary speed via c_ispeed/c_ospeed */ |
251 | if (cbaud == BOTHER) | 251 | if (cbaud == BOTHER) |
252 | return termios->c_ospeed; | 252 | return termios->c_ospeed; |
253 | #endif | 253 | #endif |
@@ -283,7 +283,7 @@ speed_t tty_termios_input_baud_rate(struct ktermios *termios) | |||
283 | if (cbaud == B0) | 283 | if (cbaud == B0) |
284 | return tty_termios_baud_rate(termios); | 284 | return tty_termios_baud_rate(termios); |
285 | 285 | ||
286 | /* Magic token for arbitary speed via c_ispeed*/ | 286 | /* Magic token for arbitrary speed via c_ispeed*/ |
287 | if (cbaud == BOTHER) | 287 | if (cbaud == BOTHER) |
288 | return termios->c_ispeed; | 288 | return termios->c_ispeed; |
289 | 289 | ||
@@ -449,7 +449,7 @@ EXPORT_SYMBOL(tty_get_baud_rate); | |||
449 | * @new: New termios | 449 | * @new: New termios |
450 | * @old: Old termios | 450 | * @old: Old termios |
451 | * | 451 | * |
452 | * Propogate the hardware specific terminal setting bits from | 452 | * Propagate the hardware specific terminal setting bits from |
453 | * the old termios structure to the new one. This is used in cases | 453 | * the old termios structure to the new one. This is used in cases |
454 | * where the hardware does not support reconfiguration or as a helper | 454 | * where the hardware does not support reconfiguration or as a helper |
455 | * in some cases where only minimal reconfiguration is supported | 455 | * in some cases where only minimal reconfiguration is supported |
diff --git a/drivers/tty/vt/vt.c b/drivers/tty/vt/vt.c index c83cdfb56fcc..4bea1efaec98 100644 --- a/drivers/tty/vt/vt.c +++ b/drivers/tty/vt/vt.c | |||
@@ -3963,7 +3963,7 @@ void reset_palette(struct vc_data *vc) | |||
3963 | * of 32 pixels. Userspace fontdata is stored with 32 bytes (shorts/ints, | 3963 | * of 32 pixels. Userspace fontdata is stored with 32 bytes (shorts/ints, |
3964 | * depending on width) reserved for each character which is kinda wasty, but | 3964 | * depending on width) reserved for each character which is kinda wasty, but |
3965 | * this is done in order to maintain compatibility with the EGA/VGA fonts. It | 3965 | * this is done in order to maintain compatibility with the EGA/VGA fonts. It |
3966 | * is upto the actual low-level console-driver convert data into its favorite | 3966 | * is up to the actual low-level console-driver convert data into its favorite |
3967 | * format (maybe we should add a `fontoffset' field to the `display' | 3967 | * format (maybe we should add a `fontoffset' field to the `display' |
3968 | * structure so we won't have to convert the fontdata all the time. | 3968 | * structure so we won't have to convert the fontdata all the time. |
3969 | * /Jes | 3969 | * /Jes |