From fc9c898cba915636226834e6e04fd40f5fb00f21 Mon Sep 17 00:00:00 2001 From: Laxman Dewangan Date: Fri, 27 Jan 2012 19:32:56 +0530 Subject: spi: tegra: dequeue dma req using tegra_dma_dequeue_req() The dma client should use the tegra_dma_dequeue_req() for dequeue the dma request. Change-Id: I1f433c85ffec997d8c608e08509c48c72b27120a Signed-off-by: Laxman Dewangan Reviewed-on: http://git-master/r/77804 Reviewed-by: Rohan Somvanshi Tested-by: Rohan Somvanshi --- drivers/spi/spi-tegra.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'drivers/spi/spi-tegra.c') diff --git a/drivers/spi/spi-tegra.c b/drivers/spi/spi-tegra.c index 1e1ec8310094..7be67d0ff2bc 100644 --- a/drivers/spi/spi-tegra.c +++ b/drivers/spi/spi-tegra.c @@ -1072,13 +1072,14 @@ static irqreturn_t spi_tegra_isr_thread(int irq, void *context_data) /* Abort dmas if any error */ if (tspi->cur_direction & DATA_DIR_TX) { if (tspi->tx_status) { - tegra_dma_dequeue(tspi->tx_dma); + tegra_dma_dequeue_req(tspi->tx_dma, &tspi->tx_dma_req); err += 1; } else { wait_status = wait_for_completion_interruptible_timeout( &tspi->tx_dma_complete, SLINK_DMA_TIMEOUT); if (wait_status <= 0) { - tegra_dma_dequeue(tspi->tx_dma); + tegra_dma_dequeue_req(tspi->tx_dma, + &tspi->tx_dma_req); dev_err(&tspi->pdev->dev, "Error in Dma Tx " "transfer\n"); err += 1; @@ -1088,13 +1089,14 @@ static irqreturn_t spi_tegra_isr_thread(int irq, void *context_data) if (tspi->cur_direction & DATA_DIR_RX) { if (tspi->rx_status) { - tegra_dma_dequeue(tspi->rx_dma); + tegra_dma_dequeue_req(tspi->rx_dma, &tspi->rx_dma_req); err += 2; } else { wait_status = wait_for_completion_interruptible_timeout( &tspi->rx_dma_complete, SLINK_DMA_TIMEOUT); if (wait_status <= 0) { - tegra_dma_dequeue(tspi->rx_dma); + tegra_dma_dequeue_req(tspi->rx_dma, + &tspi->rx_dma_req); dev_err(&tspi->pdev->dev, "Error in Dma Rx " "transfer\n"); err += 2; -- cgit v1.2.3