diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-24 15:33:30 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-24 15:33:30 -0700 |
| commit | b3e112bcc19abd8e9657dca34a87316786e096f3 (patch) | |
| tree | 39040c7a05edd69381c0a25636a1a328d856cb9c | |
| parent | f647a27417d2adc43d8c96d3d6f837422fbc076e (diff) | |
| parent | 0a8b80c52f44a6e84206618a8a450ba13a5809dc (diff) | |
| download | linux-3.10-b3e112bcc19abd8e9657dca34a87316786e096f3.tar.gz linux-3.10-b3e112bcc19abd8e9657dca34a87316786e096f3.tar.bz2 linux-3.10-b3e112bcc19abd8e9657dca34a87316786e096f3.zip | |
Merge master.kernel.org:/home/rmk/linux-2.6-serial
| -rw-r--r-- | drivers/serial/8250.c | 10 | ||||
| -rw-r--r-- | drivers/serial/au1x00_uart.c | 10 | ||||
| -rw-r--r-- | drivers/serial/m32r_sio.c | 10 | ||||
| -rw-r--r-- | drivers/serial/pxa.c | 10 |
4 files changed, 20 insertions, 20 deletions
diff --git a/drivers/serial/8250.c b/drivers/serial/8250.c index 79f67fd863e..d8b9d2b8c20 100644 --- a/drivers/serial/8250.c +++ b/drivers/serial/8250.c @@ -1682,22 +1682,22 @@ serial8250_set_termios(struct uart_port *port, struct termios *termios, switch (termios->c_cflag & CSIZE) { case CS5: - cval = 0x00; + cval = UART_LCR_WLEN5; break; case CS6: - cval = 0x01; + cval = UART_LCR_WLEN6; break; case CS7: - cval = 0x02; + cval = UART_LCR_WLEN7; break; default: case CS8: - cval = 0x03; + cval = UART_LCR_WLEN8; break; } if (termios->c_cflag & CSTOPB) - cval |= 0x04; + cval |= UART_LCR_STOP; if (termios->c_cflag & PARENB) cval |= UART_LCR_PARITY; if (!(termios->c_cflag & PARODD)) diff --git a/drivers/serial/au1x00_uart.c b/drivers/serial/au1x00_uart.c index b6d3d503494..5400dc2c087 100644 --- a/drivers/serial/au1x00_uart.c +++ b/drivers/serial/au1x00_uart.c @@ -773,22 +773,22 @@ serial8250_set_termios(struct uart_port *port, struct termios *termios, switch (termios->c_cflag & CSIZE) { case CS5: - cval = 0x00; + cval = UART_LCR_WLEN5; break; case CS6: - cval = 0x01; + cval = UART_LCR_WLEN6; break; case CS7: - cval = 0x02; + cval = UART_LCR_WLEN7; break; default: case CS8: - cval = 0x03; + cval = UART_LCR_WLEN8; break; } if (termios->c_cflag & CSTOPB) - cval |= 0x04; + cval |= UART_LCR_STOP; if (termios->c_cflag & PARENB) cval |= UART_LCR_PARITY; if (!(termios->c_cflag & PARODD)) diff --git a/drivers/serial/m32r_sio.c b/drivers/serial/m32r_sio.c index 08d61f13edc..0301feacbde 100644 --- a/drivers/serial/m32r_sio.c +++ b/drivers/serial/m32r_sio.c @@ -724,22 +724,22 @@ static void m32r_sio_set_termios(struct uart_port *port, switch (termios->c_cflag & CSIZE) { case CS5: - cval = 0x00; + cval = UART_LCR_WLEN5; break; case CS6: - cval = 0x01; + cval = UART_LCR_WLEN6; break; case CS7: - cval = 0x02; + cval = UART_LCR_WLEN7; break; default: case CS8: - cval = 0x03; + cval = UART_LCR_WLEN8; break; } if (termios->c_cflag & CSTOPB) - cval |= 0x04; + cval |= UART_LCR_STOP; if (termios->c_cflag & PARENB) cval |= UART_LCR_PARITY; if (!(termios->c_cflag & PARODD)) diff --git a/drivers/serial/pxa.c b/drivers/serial/pxa.c index 9dc151d8fa6..08b08d6ae90 100644 --- a/drivers/serial/pxa.c +++ b/drivers/serial/pxa.c @@ -455,22 +455,22 @@ serial_pxa_set_termios(struct uart_port *port, struct termios *termios, switch (termios->c_cflag & CSIZE) { case CS5: - cval = 0x00; + cval = UART_LCR_WLEN5; break; case CS6: - cval = 0x01; + cval = UART_LCR_WLEN6; break; case CS7: - cval = 0x02; + cval = UART_LCR_WLEN7; break; default: case CS8: - cval = 0x03; + cval = UART_LCR_WLEN8; break; } if (termios->c_cflag & CSTOPB) - cval |= 0x04; + cval |= UART_LCR_STOP; if (termios->c_cflag & PARENB) cval |= UART_LCR_PARITY; if (!(termios->c_cflag & PARODD)) |