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

Commit ce40c44e authored by Jiri Slaby's avatar Jiri Slaby Committed by Greg Kroah-Hartman
Browse files

tty: serial: altera_uart_{r,t}x_chars() need only uart_port 



[ Upstream commit 3af44d9bb0539d5fa27d6159d696fda5f3747bff ]

Both altera_uart_{r,t}x_chars() need only uart_port, not altera_uart. So
pass the former from altera_uart_interrupt() directly.

Apart it maybe saves a dereference, this makes the transition of
altera_uart_tx_chars() easier to follow in the next patch.

Cc: Tobias Klauser <tklauser@distanz.ch>
Reviewed-by: default avatarIlpo Järvinen <ilpo.jarvinen@linux.intel.com>
Acked-by: default avatarTobias Klauser <tklauser@distanz.ch>
Signed-off-by: default avatarJiri Slaby <jslaby@suse.cz>
Link: https://lore.kernel.org/r/20220920052049.20507-4-jslaby@suse.cz


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Stable-dep-of: 1307c5d33cce ("serial: altera_uart: fix locking in polling mode")
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 071bb9e3

drivers/tty/serial/altera_uart.c

+4 −6
Original line number Diff line number Diff line
@@ -199,9 +199,8 @@ static void altera_uart_set_termios(struct uart_port *port, 
	 */

}



static void altera_uart_rx_chars(struct altera_uart *pp)

static void altera_uart_rx_chars(struct uart_port *port)

{

	struct uart_port *port = &pp->port;

	unsigned char ch, flag;

	unsigned short status;
@@ -248,9 +247,8 @@ static void altera_uart_rx_chars(struct altera_uart *pp) 
	spin_lock(&port->lock);

}



static void altera_uart_tx_chars(struct altera_uart *pp)

static void altera_uart_tx_chars(struct uart_port *port)

{

	struct uart_port *port = &pp->port;

	struct circ_buf *xmit = &port->state->xmit;



	if (port->x_char) {
@@ -288,9 +286,9 @@ static irqreturn_t altera_uart_interrupt(int irq, void *data) 


	spin_lock(&port->lock);

	if (isr & ALTERA_UART_STATUS_RRDY_MSK)

		altera_uart_rx_chars(pp);

		altera_uart_rx_chars(port);

	if (isr & ALTERA_UART_STATUS_TRDY_MSK)

		altera_uart_tx_chars(pp);

		altera_uart_tx_chars(port);

	spin_unlock(&port->lock);



	return IRQ_RETVAL(isr);