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

Commit 9c4ef4b0 authored by Andre Przywara's avatar Andre Przywara Committed by Greg Kroah-Hartman
Browse files

drivers: PL011: move cts_event workaround into separate function 



To avoid lines with more than 80 characters and to make the
pl011_int() function more readable, move the workaround out into a
separate function.

Signed-off-by: default avatarAndre Przywara <andre.przywara@arm.com>
Tested-by: default avatarMark Langsdorf <mlangsdo@redhat.com>
Tested-by: default avatarNaresh Bhat <nbhat@cavium.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 075167ed

drivers/tty/serial/amba-pl011.c

+20 −13
Original line number Diff line number Diff line
@@ -1317,21 +1317,13 @@ static void pl011_modem_status(struct uart_amba_port *uap) 
	wake_up_interruptible(&uap->port.state->port.delta_msr_wait);

}



static irqreturn_t pl011_int(int irq, void *dev_id)

static void check_apply_cts_event_workaround(struct uart_amba_port *uap)

{

	struct uart_amba_port *uap = dev_id;

	unsigned long flags;

	unsigned int status, pass_counter = AMBA_ISR_PASS_LIMIT;

	u16 imsc;

	int handled = 0;

	unsigned int dummy_read;



	spin_lock_irqsave(&uap->port.lock, flags);

	imsc = readw(uap->port.membase + UART011_IMSC);

	status = readw(uap->port.membase + UART011_RIS) & imsc;

	if (status) {

		do {

			if (uap->vendor->cts_event_workaround) {

	if (!uap->vendor->cts_event_workaround)

		return;



	/* workaround to make sure that all bits are unlocked.. */

	writew(0x00, uap->port.membase + UART011_ICR);
@@ -1344,6 +1336,21 @@ static irqreturn_t pl011_int(int irq, void *dev_id) 
	dummy_read = readw(uap->port.membase + UART011_ICR);

}



static irqreturn_t pl011_int(int irq, void *dev_id)

{

	struct uart_amba_port *uap = dev_id;

	unsigned long flags;

	unsigned int status, pass_counter = AMBA_ISR_PASS_LIMIT;

	u16 imsc;

	int handled = 0;



	spin_lock_irqsave(&uap->port.lock, flags);

	imsc = readw(uap->port.membase + UART011_IMSC);

	status = readw(uap->port.membase + UART011_RIS) & imsc;

	if (status) {

		do {

			check_apply_cts_event_workaround(uap);



			writew(status & ~(UART011_TXIS|UART011_RTIS|

					  UART011_RXIS),

			       uap->port.membase + UART011_ICR);