Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 30c6c6b5 authored by Feng Tang's avatar Feng Tang Committed by Greg Kroah-Hartman
Browse files

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: default avatarFeng Tang <feng.tang@intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent d011411d

drivers/tty/serial/pch_uart.c

+8 −21
Original line number Diff line number Diff line
@@ -373,14 +373,6 @@ static void pch_uart_hal_request(struct pci_dev *pdev, int fifosize, 
	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,

					  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)

{

	priv->dmsr = 0;

	return get_msr(priv, priv->membase);

	unsigned int msr = ioread8(priv->membase + UART_MSR);

	priv->dmsr = msr & PCH_UART_MSR_DELTA;

	return (u8)msr;

}



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)

{

	int ret;

	int ret = 0;

	struct uart_port *port = &priv->port;



	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;

		port->x_char = 0;

		ret = 1;

	} else {

		ret = 0;

	}



	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)

{

	struct eg20t_port *priv;

	int ret;



	priv = container_of(port, struct eg20t_port, port);

	if (priv->tx_empty)

		ret = TIOCSER_TEMT;

		return TIOCSER_TEMT;

	else

		ret = 0;



	return ret;

		return 0;

}



/* Returns the current state of modem control inputs. */
@@ -1345,9 +1334,8 @@ static void pch_uart_set_termios(struct uart_port *port, 
		else

			parity = PCH_UART_HAL_PARITY_EVEN;



	} else {

	} else

		parity = PCH_UART_HAL_PARITY_NONE;

	}



	/* Only UART0 has auto hardware flow function */

	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)

{

	struct eg20t_port *priv;



	unsigned long flags;

	u8 ier;

	int locked = 1;