diff options
author | Guennadi Liakhovetski <g.liakhovetski@gmx.de> | 2013-12-10 08:54:42 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-12-17 12:36:23 -0500 |
commit | 30ae5859186f564d40cee04579e901e41c3826e2 (patch) | |
tree | 32618b0c528939a5251a0eaaf55b6c64bd08fb4d | |
parent | 570d291048aecc02271884f6a5f50ad555f271a5 (diff) |
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: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r-- | drivers/tty/serial/amba-pl011.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/tty/serial/amba-pl011.c b/drivers/tty/serial/amba-pl011.c index 182a922e1942..ea6c2a3798ff 100644 --- a/drivers/tty/serial/amba-pl011.c +++ b/drivers/tty/serial/amba-pl011.c | |||
@@ -1214,8 +1214,8 @@ __acquires(&uap->port.lock) | |||
1214 | dev_dbg(uap->port.dev, "could not trigger RX DMA job " | 1214 | dev_dbg(uap->port.dev, "could not trigger RX DMA job " |
1215 | "fall back to interrupt mode again\n"); | 1215 | "fall back to interrupt mode again\n"); |
1216 | uap->im |= UART011_RXIM; | 1216 | uap->im |= UART011_RXIM; |
1217 | writew(uap->im, uap->port.membase + UART011_IMSC); | ||
1217 | } else { | 1218 | } else { |
1218 | uap->im &= ~UART011_RXIM; | ||
1219 | #ifdef CONFIG_DMA_ENGINE | 1219 | #ifdef CONFIG_DMA_ENGINE |
1220 | /* Start Rx DMA poll */ | 1220 | /* Start Rx DMA poll */ |
1221 | if (uap->dmarx.poll_rate) { | 1221 | if (uap->dmarx.poll_rate) { |
@@ -1227,8 +1227,6 @@ __acquires(&uap->port.lock) | |||
1227 | } | 1227 | } |
1228 | #endif | 1228 | #endif |
1229 | } | 1229 | } |
1230 | |||
1231 | writew(uap->im, uap->port.membase + UART011_IMSC); | ||
1232 | } | 1230 | } |
1233 | spin_lock(&uap->port.lock); | 1231 | spin_lock(&uap->port.lock); |
1234 | } | 1232 | } |