aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/tty
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/tty')
-rw-r--r--drivers/tty/nozomi.c6
-rw-r--r--drivers/tty/serial/bfin_uart.c4
-rw-r--r--drivers/tty/serial/ip22zilog.c2
-rw-r--r--drivers/tty/serial/max310x.c2
-rw-r--r--drivers/tty/serial/pmac_zilog.c2
-rw-r--r--drivers/tty/serial/sunsab.c2
-rw-r--r--drivers/tty/serial/sunsu.c2
-rw-r--r--drivers/tty/serial/sunzilog.c6
-rw-r--r--drivers/tty/serial/ucc_uart.c2
9 files changed, 14 insertions, 14 deletions
diff --git a/drivers/tty/nozomi.c b/drivers/tty/nozomi.c
index d6080c3831ef..cd0429369557 100644
--- a/drivers/tty/nozomi.c
+++ b/drivers/tty/nozomi.c
@@ -959,7 +959,7 @@ static int receive_flow_control(struct nozomi *dc)
959 dev_err(&dc->pdev->dev, 959 dev_err(&dc->pdev->dev,
960 "ERROR: flow control received for non-existing port\n"); 960 "ERROR: flow control received for non-existing port\n");
961 return 0; 961 return 0;
962 }; 962 }
963 963
964 DBG1("0x%04X->0x%04X", *((u16 *)&dc->port[port].ctrl_dl), 964 DBG1("0x%04X->0x%04X", *((u16 *)&dc->port[port].ctrl_dl),
965 *((u16 *)&ctrl_dl)); 965 *((u16 *)&ctrl_dl));
@@ -1025,7 +1025,7 @@ static enum ctrl_port_type port2ctrl(enum port_type port,
1025 dev_err(&dc->pdev->dev, 1025 dev_err(&dc->pdev->dev,
1026 "ERROR: send flow control " \ 1026 "ERROR: send flow control " \
1027 "received for non-existing port\n"); 1027 "received for non-existing port\n");
1028 }; 1028 }
1029 return CTRL_ERROR; 1029 return CTRL_ERROR;
1030} 1030}
1031 1031
@@ -1805,7 +1805,7 @@ static int ntty_ioctl(struct tty_struct *tty,
1805 default: 1805 default:
1806 DBG1("ERR: 0x%08X, %d", cmd, cmd); 1806 DBG1("ERR: 0x%08X, %d", cmd, cmd);
1807 break; 1807 break;
1808 }; 1808 }
1809 1809
1810 return rval; 1810 return rval;
1811} 1811}
diff --git a/drivers/tty/serial/bfin_uart.c b/drivers/tty/serial/bfin_uart.c
index 8f9b3495ef5d..869ceba2ec57 100644
--- a/drivers/tty/serial/bfin_uart.c
+++ b/drivers/tty/serial/bfin_uart.c
@@ -680,7 +680,7 @@ static int bfin_serial_startup(struct uart_port *port)
680 default: 680 default:
681 uart_dma_ch_rx = uart_dma_ch_tx = 0; 681 uart_dma_ch_rx = uart_dma_ch_tx = 0;
682 break; 682 break;
683 }; 683 }
684 684
685 if (uart_dma_ch_rx && 685 if (uart_dma_ch_rx &&
686 request_dma(uart_dma_ch_rx, "BFIN_UART_RX") < 0) { 686 request_dma(uart_dma_ch_rx, "BFIN_UART_RX") < 0) {
@@ -765,7 +765,7 @@ static void bfin_serial_shutdown(struct uart_port *port)
765 break; 765 break;
766 default: 766 default:
767 break; 767 break;
768 }; 768 }
769#endif 769#endif
770 free_irq(uart->rx_irq, uart); 770 free_irq(uart->rx_irq, uart);
771 free_irq(uart->tx_irq, uart); 771 free_irq(uart->tx_irq, uart);
diff --git a/drivers/tty/serial/ip22zilog.c b/drivers/tty/serial/ip22zilog.c
index cb3c81eb0996..1d9420548e16 100644
--- a/drivers/tty/serial/ip22zilog.c
+++ b/drivers/tty/serial/ip22zilog.c
@@ -832,7 +832,7 @@ ip22zilog_convert_to_zs(struct uart_ip22zilog_port *up, unsigned int cflag,
832 up->curregs[5] |= Tx8; 832 up->curregs[5] |= Tx8;
833 up->parity_mask = 0xff; 833 up->parity_mask = 0xff;
834 break; 834 break;
835 }; 835 }
836 up->curregs[4] &= ~0x0c; 836 up->curregs[4] &= ~0x0c;
837 if (cflag & CSTOPB) 837 if (cflag & CSTOPB)
838 up->curregs[4] |= SB2; 838 up->curregs[4] |= SB2;
diff --git a/drivers/tty/serial/max310x.c b/drivers/tty/serial/max310x.c
index b2e707aa603a..8d71e4047bb3 100644
--- a/drivers/tty/serial/max310x.c
+++ b/drivers/tty/serial/max310x.c
@@ -690,7 +690,7 @@ static void max310x_handle_tx(struct uart_port *port)
690 max310x_port_write(port, MAX310X_THR_REG, 690 max310x_port_write(port, MAX310X_THR_REG,
691 xmit->buf[xmit->tail]); 691 xmit->buf[xmit->tail]);
692 xmit->tail = (xmit->tail + 1) & (UART_XMIT_SIZE - 1); 692 xmit->tail = (xmit->tail + 1) & (UART_XMIT_SIZE - 1);
693 }; 693 }
694 } 694 }
695 695
696 if (uart_circ_chars_pending(xmit) < WAKEUP_CHARS) 696 if (uart_circ_chars_pending(xmit) < WAKEUP_CHARS)
diff --git a/drivers/tty/serial/pmac_zilog.c b/drivers/tty/serial/pmac_zilog.c
index f87f1a0c8c6e..95917cefe14f 100644
--- a/drivers/tty/serial/pmac_zilog.c
+++ b/drivers/tty/serial/pmac_zilog.c
@@ -1072,7 +1072,7 @@ static void pmz_convert_to_zs(struct uart_pmac_port *uap, unsigned int cflag,
1072 uap->curregs[5] |= Tx8; 1072 uap->curregs[5] |= Tx8;
1073 uap->parity_mask = 0xff; 1073 uap->parity_mask = 0xff;
1074 break; 1074 break;
1075 }; 1075 }
1076 uap->curregs[4] &= ~(SB_MASK); 1076 uap->curregs[4] &= ~(SB_MASK);
1077 if (cflag & CSTOPB) 1077 if (cflag & CSTOPB)
1078 uap->curregs[4] |= SB2; 1078 uap->curregs[4] |= SB2;
diff --git a/drivers/tty/serial/sunsab.c b/drivers/tty/serial/sunsab.c
index 5d6136b2a04a..380fb5355cb2 100644
--- a/drivers/tty/serial/sunsab.c
+++ b/drivers/tty/serial/sunsab.c
@@ -894,7 +894,7 @@ static int sunsab_console_setup(struct console *con, char *options)
894 case B115200: baud = 115200; break; 894 case B115200: baud = 115200; break;
895 case B230400: baud = 230400; break; 895 case B230400: baud = 230400; break;
896 case B460800: baud = 460800; break; 896 case B460800: baud = 460800; break;
897 }; 897 }
898 898
899 /* 899 /*
900 * Temporary fix. 900 * Temporary fix.
diff --git a/drivers/tty/serial/sunsu.c b/drivers/tty/serial/sunsu.c
index 699cc1b5f6aa..db79b76f5c8e 100644
--- a/drivers/tty/serial/sunsu.c
+++ b/drivers/tty/serial/sunsu.c
@@ -522,7 +522,7 @@ static void receive_kbd_ms_chars(struct uart_sunsu_port *up, int is_break)
522 serio_interrupt(&up->serio, ch, 0); 522 serio_interrupt(&up->serio, ch, 0);
523#endif 523#endif
524 break; 524 break;
525 }; 525 }
526 } 526 }
527 } while (serial_in(up, UART_LSR) & UART_LSR_DR); 527 } while (serial_in(up, UART_LSR) & UART_LSR_DR);
528} 528}
diff --git a/drivers/tty/serial/sunzilog.c b/drivers/tty/serial/sunzilog.c
index 135a15203532..45a8c6aa5837 100644
--- a/drivers/tty/serial/sunzilog.c
+++ b/drivers/tty/serial/sunzilog.c
@@ -319,7 +319,7 @@ static void sunzilog_kbdms_receive_chars(struct uart_sunzilog_port *up,
319 serio_interrupt(&up->serio, ch, 0); 319 serio_interrupt(&up->serio, ch, 0);
320#endif 320#endif
321 break; 321 break;
322 }; 322 }
323 } 323 }
324} 324}
325 325
@@ -897,7 +897,7 @@ sunzilog_convert_to_zs(struct uart_sunzilog_port *up, unsigned int cflag,
897 up->curregs[R5] |= Tx8; 897 up->curregs[R5] |= Tx8;
898 up->parity_mask = 0xff; 898 up->parity_mask = 0xff;
899 break; 899 break;
900 }; 900 }
901 up->curregs[R4] &= ~0x0c; 901 up->curregs[R4] &= ~0x0c;
902 if (cflag & CSTOPB) 902 if (cflag & CSTOPB)
903 up->curregs[R4] |= SB2; 903 up->curregs[R4] |= SB2;
@@ -1239,7 +1239,7 @@ static int __init sunzilog_console_setup(struct console *con, char *options)
1239 default: case B9600: baud = 9600; break; 1239 default: case B9600: baud = 9600; break;
1240 case B19200: baud = 19200; break; 1240 case B19200: baud = 19200; break;
1241 case B38400: baud = 38400; break; 1241 case B38400: baud = 38400; break;
1242 }; 1242 }
1243 1243
1244 brg = BPS_TO_BRG(baud, ZS_CLOCK / ZS_CLOCK_DIVISOR); 1244 brg = BPS_TO_BRG(baud, ZS_CLOCK / ZS_CLOCK_DIVISOR);
1245 1245
diff --git a/drivers/tty/serial/ucc_uart.c b/drivers/tty/serial/ucc_uart.c
index 88317482b81f..2fd1e1789811 100644
--- a/drivers/tty/serial/ucc_uart.c
+++ b/drivers/tty/serial/ucc_uart.c
@@ -269,7 +269,7 @@ static unsigned int qe_uart_tx_empty(struct uart_port *port)
269 return 1; 269 return 1;
270 270
271 bdp++; 271 bdp++;
272 }; 272 }
273} 273}
274 274
275/* 275/*