Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]


Groups > linux.kernel > #1286272

[PATCH v6 6/8] spi: imx: remove dead RX DMA tail handling code

From Anton Bondarenko <anton.bondarenko.sama@gmail.com>
Newsgroups linux.kernel
Subject [PATCH v6 6/8] spi: imx: remove dead RX DMA tail handling code
Date 2015-12-08 07:50 +0100
Message-ID <qDkg1-7d6-11@gated-at.bofh.it> (permalink)
References <qDkg1-7d6-1@gated-at.bofh.it>
Organization linux.* mail to news gateway

Show all headers | View raw


transfer->len % wml for DMA capable transactions will always be 0
due to recent change in can_dma checks. So it's safe to remove dead code
in processing DMA.

Signed-off-by: Anton Bondarenko <anton.bondarenko.sama@gmail.com>
---
 drivers/spi/spi-imx.c | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/drivers/spi/spi-imx.c b/drivers/spi/spi-imx.c
index 50e0a79..08492d6 100644
--- a/drivers/spi/spi-imx.c
+++ b/drivers/spi/spi-imx.c
@@ -919,8 +919,6 @@ static int spi_imx_dma_transfer(struct spi_imx_data *spi_imx,
 	struct dma_async_tx_descriptor *desc_tx = NULL, *desc_rx = NULL;
 	int ret;
 	unsigned long timeout;
-	u32 dma;
-	int left;
 	struct spi_master *master = spi_imx->bitbang.master;
 	struct sg_table *tx = &transfer->tx_sg, *rx = &transfer->rx_sg;
 
@@ -954,13 +952,6 @@ static int spi_imx_dma_transfer(struct spi_imx_data *spi_imx,
 	/* Trigger the cspi module. */
 	spi_imx->dma_finished = 0;
 
-	dma = readl(spi_imx->base + MX51_ECSPI_DMA);
-	dma = dma & (~MX51_ECSPI_DMA_RXT_WML_MASK);
-	/* Change RX_DMA_LENGTH trigger dma fetch tail data */
-	left = transfer->len % spi_imx->wml;
-	if (left)
-		writel(dma | (left << MX51_ECSPI_DMA_RXT_WML_OFFSET),
-				spi_imx->base + MX51_ECSPI_DMA);
 	/*
 	 * Set these order to avoid potential RX overflow. The overflow may
 	 * happen if we enable SPI HW before starting RX DMA due to rescheduling
@@ -992,10 +983,6 @@ static int spi_imx_dma_transfer(struct spi_imx_data *spi_imx,
 			spi_imx->devtype_data->reset(spi_imx);
 			dmaengine_terminate_all(master->dma_rx);
 		}
-		dma &= ~MX51_ECSPI_DMA_RXT_WML_MASK;
-		writel(dma |
-		       spi_imx->wml << MX51_ECSPI_DMA_RXT_WML_OFFSET,
-		       spi_imx->base + MX51_ECSPI_DMA);
 	}
 
 	spi_imx->dma_finished = 1;
-- 
2.6.3

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread


Thread

[PATCH v6 0/8]  Improvements for SPI IMX driver for Freescale ECSPI controller, continuation Anton Bondarenko <anton.bondarenko.sama@gmail.com> - 2015-12-08 07:50 +0100
  [PATCH v6 4/8] spi: imx: defer spi initialization, if DMA engine is Anton Bondarenko <anton.bondarenko.sama@gmail.com> - 2015-12-08 07:50 +0100
  [PATCH v6 2/8] spi: imx: enable loopback only for ECSPI controller family Anton Bondarenko <anton.bondarenko.sama@gmail.com> - 2015-12-08 07:50 +0100
  [PATCH v6 6/8] spi: imx: remove dead RX DMA tail handling code Anton Bondarenko <anton.bondarenko.sama@gmail.com> - 2015-12-08 07:50 +0100
  [PATCH v6 8/8] spi: imx: add support for all SPI word width for DMA Anton Bondarenko <anton.bondarenko.sama@gmail.com> - 2015-12-08 07:50 +0100
  [PATCH v6 1/8] spi: imx: fix loopback mode setup after controller reset Anton Bondarenko <anton.bondarenko.sama@gmail.com> - 2015-12-08 07:50 +0100
  [PATCH v6 3/8] spi: imx: return error from dma channel request Anton Bondarenko <anton.bondarenko.sama@gmail.com> - 2015-12-08 07:50 +0100
  [PATCH v6 5/8] spi: imx: allow only WML aligned transfers to use DMA Anton Bondarenko <anton.bondarenko.sama@gmail.com> - 2015-12-08 07:50 +0100
  [PATCH v6 7/8] spi: imx: replace fixed timeout with calculated Anton Bondarenko <anton.bondarenko.sama@gmail.com> - 2015-12-08 07:50 +0100

csiph-web