openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

serial: 8250: Refactor LCR computation 

Refactor the computation of the LCR register value from termios c_cflag
into a new local function, serial8250_compute_lcr().

Signed-off-by: Peter Hurley <peter@hurleysoftware.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Peter Hurley 2015-01-22 12:24:27 -05:00 committed by Greg Kroah-Hartman
parent d1f2f21931
commit 0ec3f585cf
1 changed files with 21 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
drivers/tty/serial/8250/8250_core.c
View File

@ -2440,16 +2440,12 @@ static unsigned int serial8250_get_divisor(struct uart_8250_port *up, unsigned i
return quot; return quot;
} }
void static unsigned char serial8250_compute_lcr(struct uart_8250_port *up,
serial8250_do_set_termios(struct uart_port *port, struct ktermios *termios, tcflag_t c_cflag)
struct ktermios *old)
{ {
struct uart_8250_port *up = up_to_u8250p(port);
unsigned char cval; unsigned char cval;
unsigned long flags;
unsigned int baud, quot;
switch (termios->c_cflag & CSIZE) { switch (c_cflag & CSIZE) {
case CS5: case CS5:
cval = UART_LCR_WLEN5; cval = UART_LCR_WLEN5;
break; break;
@ -2465,20 +2461,34 @@ serial8250_do_set_termios(struct uart_port *port, struct ktermios *termios,
break; break;
} }
if (termios->c_cflag & CSTOPB) if (c_cflag & CSTOPB)
cval |= UART_LCR_STOP; cval |= UART_LCR_STOP;
if (termios->c_cflag & PARENB) { if (c_cflag & PARENB) {
cval |= UART_LCR_PARITY; cval |= UART_LCR_PARITY;
if (up->bugs & UART_BUG_PARITY) if (up->bugs & UART_BUG_PARITY)
up->fifo_bug = true; up->fifo_bug = true;
} }
if (!(termios->c_cflag & PARODD)) if (!(c_cflag & PARODD))
cval |= UART_LCR_EPAR; cval |= UART_LCR_EPAR;
#ifdef CMSPAR #ifdef CMSPAR
if (termios->c_cflag & CMSPAR) if (c_cflag & CMSPAR)
cval |= UART_LCR_SPAR; cval |= UART_LCR_SPAR;
#endif #endif
return cval;
}
void
serial8250_do_set_termios(struct uart_port *port, struct ktermios *termios,
struct ktermios *old)
{
struct uart_8250_port *up = up_to_u8250p(port);
unsigned char cval;
unsigned long flags;
unsigned int baud, quot;
cval = serial8250_compute_lcr(up, termios->c_cflag);
/* /*
* Ask the core to calculate the divisor for us. * Ask the core to calculate the divisor for us.
*/ */