UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

serial: pch_uart: trivial cleanup by removing the get_msr() 

The short get_msr() has some unnecessary code and only used once,
so merge it with its caller to make code cleaner. No functional
change at all.

Signed-off-by: Feng Tang <feng.tang@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Feng Tang 2012-02-06 17:24:44 +08:00 committed by Greg Kroah-Hartman
parent d011411ddb
commit 30c6c6b5bf
1 changed files with 8 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
drivers/tty/serial/pch_uart.c
View File

@ -373,14 +373,6 @@ static void pch_uart_hal_request(struct pci_dev *pdev, int fifosize,
priv->fcr = 0; priv->fcr = 0;
} }
static unsigned int get_msr(struct eg20t_port *priv, void __iomem *base)
{
unsigned int msr = ioread8(base + UART_MSR);
priv->dmsr |= msr & PCH_UART_MSR_DELTA;
return msr;
}
static void pch_uart_hal_enable_interrupt(struct eg20t_port *priv, static void pch_uart_hal_enable_interrupt(struct eg20t_port *priv,
unsigned int flag) unsigned int flag)
{ {
@ -514,8 +506,9 @@ static int pch_uart_hal_set_fifo(struct eg20t_port *priv,
static u8 pch_uart_hal_get_modem(struct eg20t_port *priv) static u8 pch_uart_hal_get_modem(struct eg20t_port *priv)
{ {
priv->dmsr = 0; unsigned int msr = ioread8(priv->membase + UART_MSR);
return get_msr(priv, priv->membase); priv->dmsr = msr & PCH_UART_MSR_DELTA;
return (u8)msr;
} }
static void pch_uart_hal_write(struct eg20t_port *priv, static void pch_uart_hal_write(struct eg20t_port *priv,
@ -596,7 +589,7 @@ static int push_rx(struct eg20t_port *priv, const unsigned char *buf,
static int pop_tx_x(struct eg20t_port *priv, unsigned char *buf) static int pop_tx_x(struct eg20t_port *priv, unsigned char *buf)
{ {
int ret; int ret = 0;
struct uart_port *port = &priv->port; struct uart_port *port = &priv->port;
if (port->x_char) { if (port->x_char) {
@ -605,8 +598,6 @@ static int pop_tx_x(struct eg20t_port *priv, unsigned char *buf)
buf[0] = port->x_char; buf[0] = port->x_char;
port->x_char = 0; port->x_char = 0;
ret = 1; ret = 1;
} else {
ret = 0;
} }
return ret; return ret;
@ -1104,14 +1095,12 @@ static irqreturn_t pch_uart_interrupt(int irq, void *dev_id)
static unsigned int pch_uart_tx_empty(struct uart_port *port) static unsigned int pch_uart_tx_empty(struct uart_port *port)
{ {
struct eg20t_port *priv; struct eg20t_port *priv;
int ret;
priv = container_of(port, struct eg20t_port, port); priv = container_of(port, struct eg20t_port, port);
if (priv->tx_empty) if (priv->tx_empty)
ret = TIOCSER_TEMT; return TIOCSER_TEMT;
else else
ret = 0; return 0;
return ret;
} }
/* Returns the current state of modem control inputs. */ /* Returns the current state of modem control inputs. */
@ -1345,9 +1334,8 @@ static void pch_uart_set_termios(struct uart_port *port,
else else
parity = PCH_UART_HAL_PARITY_EVEN; parity = PCH_UART_HAL_PARITY_EVEN;
} else { } else
parity = PCH_UART_HAL_PARITY_NONE; parity = PCH_UART_HAL_PARITY_NONE;
}
/* Only UART0 has auto hardware flow function */ /* Only UART0 has auto hardware flow function */
if ((termios->c_cflag & CRTSCTS) && (priv->fifo_size == 256)) if ((termios->c_cflag & CRTSCTS) && (priv->fifo_size == 256))
@ -1519,7 +1507,6 @@ static void
pch_console_write(struct console *co, const char *s, unsigned int count) pch_console_write(struct console *co, const char *s, unsigned int count)
{ {
struct eg20t_port *priv; struct eg20t_port *priv;
unsigned long flags; unsigned long flags;
u8 ier; u8 ier;
int locked = 1; int locked = 1;