summaryrefslogtreecommitdiffstats
path: root/drivers/tty
diff options
context:
space:
mode:
authorHuang Shijie2013-10-11 12:31:01 +0200
committerGreg Kroah-Hartman2013-10-16 22:19:55 +0200
commitf0ef8834b280ebb6c271f155ea040bf4af6c1881 (patch)
tree61ff7ac3ee31cab16788e6a82ceb34b08bce4c30 /drivers/tty
parentserial: imx: fix the wrong number of scatterlist entries when xmit->head is 0 (diff)
downloadkernel-qcow2-linux-f0ef8834b280ebb6c271f155ea040bf4af6c1881.tar.gz
kernel-qcow2-linux-f0ef8834b280ebb6c271f155ea040bf4af6c1881.tar.xz
kernel-qcow2-linux-f0ef8834b280ebb6c271f155ea040bf4af6c1881.zip
serial: imx: use the dmaengine_tx_status
Use the dmaengine_tx_status to simplify the code, do not change any logic. Signed-off-by: Huang Shijie <b32955@freescale.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/tty')
-rw-r--r--drivers/tty/serial/imx.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/tty/serial/imx.c b/drivers/tty/serial/imx.c
index cadf7e5848b2..13c2c2d09cac 100644
--- a/drivers/tty/serial/imx.c
+++ b/drivers/tty/serial/imx.c
@@ -521,7 +521,7 @@ static void dma_tx_work(struct work_struct *w)
unsigned long flags;
int ret;
- status = chan->device->device_tx_status(chan, (dma_cookie_t)0, NULL);
+ status = dmaengine_tx_status(chan, (dma_cookie_t)0, NULL);
if (DMA_IN_PROGRESS == status)
return;
@@ -926,7 +926,7 @@ static void dma_rx_callback(void *data)
/* unmap it first */
dma_unmap_sg(sport->port.dev, sgl, 1, DMA_FROM_DEVICE);
- status = chan->device->device_tx_status(chan, (dma_cookie_t)0, &state);
+ status = dmaengine_tx_status(chan, (dma_cookie_t)0, &state);
count = RX_BUF_SIZE - state.residue;
dev_dbg(sport->port.dev, "We get %d bytes.\n", count);