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

Commit 30ae5859 authored by Guennadi Liakhovetski's avatar Guennadi Liakhovetski Committed by Greg Kroah-Hartman
Browse files

serial: pl011: (cosmetic) remove superfluous register write 



In pl011_rx_chars() if pl011_dma_rx_trigger_dma() succeeds it will disable
the receive interrupt, no need to do this again.

Signed-off-by: default avatarGuennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 570d2910

drivers/tty/serial/amba-pl011.c

+1 −3
Original line number Original line Diff line number Diff line
@@ -1214,8 +1214,8 @@ __acquires(&uap->port.lock) 
			dev_dbg(uap->port.dev, "could not trigger RX DMA job "

			dev_dbg(uap->port.dev, "could not trigger RX DMA job "

				"fall back to interrupt mode again\n");

				"fall back to interrupt mode again\n");

			uap->im |= UART011_RXIM;

			uap->im |= UART011_RXIM;

			writew(uap->im, uap->port.membase + UART011_IMSC);

		} else {

		} else {

			uap->im &= ~UART011_RXIM;

#ifdef CONFIG_DMA_ENGINE

#ifdef CONFIG_DMA_ENGINE

			/* Start Rx DMA poll */

			/* Start Rx DMA poll */

			if (uap->dmarx.poll_rate) {

			if (uap->dmarx.poll_rate) {
@@ -1227,8 +1227,6 @@ __acquires(&uap->port.lock) 
			}

			}

#endif

#endif

		}

		}



		writew(uap->im, uap->port.membase + UART011_IMSC);

	}

	}

	spin_lock(&uap->port.lock);

	spin_lock(&uap->port.lock);

}

}