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

Commit d4b9b578 authored by H Hartley Sweeten's avatar H Hartley Sweeten Committed by Grant Likely
Browse files

spi/spi-ep93xx.c: use dma_transfer_direction instead of dma_data_direction 



A new enum indicating the dma channel direction was introduced by:

commit 49920bc6
    dmaengine: add new enum dma_transfer_direction

The following commit changed spi-ep93xx to use the new enum:

commit a485df4b
    spi, serial: move to dma_transfer_direction

In doing so a sparse warning was introduced:

warning: mixing different enum types
   int enum dma_data_direction  versus
   int enum dma_transfer_direction

This is produced because the 'dir' passed in ep93xx_spi_dma_prepare
is an enum dma_data_direction and is being used to set the
dma_slave_config 'direction' which is now an enum dma_transfer_direction.

Fix this by converting spi-ep93xx to use the new enum type in all
places.

Signed-off-by: default avatarH Hartley Sweeten <hsweeten@visionengravers.com>
Acked-by: default avatarMika Westerberg <mika.westerberg@iki.fi>
Acked-by: default avatarVinod Koul <vinod.koul@intel.com>
Signed-off-by: default avatarGrant Likely <grant.likely@secretlab.ca>
parent dbabe0d6

drivers/spi/spi-ep93xx.c

+10 −14
Original line number Original line Diff line number Diff line
@@ -545,13 +545,12 @@ static void ep93xx_spi_pio_transfer(struct ep93xx_spi *espi) 
 * in case of failure.

 * in case of failure.

 */

 */

static struct dma_async_tx_descriptor *

static struct dma_async_tx_descriptor *

ep93xx_spi_dma_prepare(struct ep93xx_spi *espi, enum dma_data_direction dir)

ep93xx_spi_dma_prepare(struct ep93xx_spi *espi, enum dma_transfer_direction dir)

{

{

	struct spi_transfer *t = espi->current_msg->state;

	struct spi_transfer *t = espi->current_msg->state;

	struct dma_async_tx_descriptor *txd;

	struct dma_async_tx_descriptor *txd;

	enum dma_slave_buswidth buswidth;

	enum dma_slave_buswidth buswidth;

	struct dma_slave_config conf;

	struct dma_slave_config conf;

	enum dma_transfer_direction slave_dirn;

	struct scatterlist *sg;

	struct scatterlist *sg;

	struct sg_table *sgt;

	struct sg_table *sgt;

	struct dma_chan *chan;

	struct dma_chan *chan;
@@ -567,14 +566,13 @@ ep93xx_spi_dma_prepare(struct ep93xx_spi *espi, enum dma_data_direction dir) 
	memset(&conf, 0, sizeof(conf));

	memset(&conf, 0, sizeof(conf));

	conf.direction = dir;

	conf.direction = dir;





	if (dir == DMA_FROM_DEVICE) {

	if (dir == DMA_DEV_TO_MEM) {

		chan = espi->dma_rx;

		chan = espi->dma_rx;

		buf = t->rx_buf;

		buf = t->rx_buf;

		sgt = &espi->rx_sgt;

		sgt = &espi->rx_sgt;





		conf.src_addr = espi->sspdr_phys;

		conf.src_addr = espi->sspdr_phys;

		conf.src_addr_width = buswidth;

		conf.src_addr_width = buswidth;

		slave_dirn = DMA_DEV_TO_MEM;

	} else {

	} else {

		chan = espi->dma_tx;

		chan = espi->dma_tx;

		buf = t->tx_buf;

		buf = t->tx_buf;
@@ -582,7 +580,6 @@ ep93xx_spi_dma_prepare(struct ep93xx_spi *espi, enum dma_data_direction dir) 




		conf.dst_addr = espi->sspdr_phys;

		conf.dst_addr = espi->sspdr_phys;

		conf.dst_addr_width = buswidth;

		conf.dst_addr_width = buswidth;

		slave_dirn = DMA_MEM_TO_DEV;

	}

	}





	ret = dmaengine_slave_config(chan, &conf);

	ret = dmaengine_slave_config(chan, &conf);
@@ -633,8 +630,7 @@ ep93xx_spi_dma_prepare(struct ep93xx_spi *espi, enum dma_data_direction dir) 
	if (!nents)

	if (!nents)

		return ERR_PTR(-ENOMEM);

		return ERR_PTR(-ENOMEM);





	txd = dmaengine_prep_slave_sg(chan, sgt->sgl, nents,

	txd = dmaengine_prep_slave_sg(chan, sgt->sgl, nents, dir, DMA_CTRL_ACK);

					slave_dirn, DMA_CTRL_ACK);

	if (!txd) {

	if (!txd) {

		dma_unmap_sg(chan->device->dev, sgt->sgl, sgt->nents, dir);

		dma_unmap_sg(chan->device->dev, sgt->sgl, sgt->nents, dir);

		return ERR_PTR(-ENOMEM);

		return ERR_PTR(-ENOMEM);
@@ -651,12 +647,12 @@ ep93xx_spi_dma_prepare(struct ep93xx_spi *espi, enum dma_data_direction dir) 
 * unmapped.

 * unmapped.

 */

 */

static void ep93xx_spi_dma_finish(struct ep93xx_spi *espi,

static void ep93xx_spi_dma_finish(struct ep93xx_spi *espi,

				  enum dma_data_direction dir)

				  enum dma_transfer_direction dir)

{

{

	struct dma_chan *chan;

	struct dma_chan *chan;

	struct sg_table *sgt;

	struct sg_table *sgt;





	if (dir == DMA_FROM_DEVICE) {

	if (dir == DMA_DEV_TO_MEM) {

		chan = espi->dma_rx;

		chan = espi->dma_rx;

		sgt = &espi->rx_sgt;

		sgt = &espi->rx_sgt;

	} else {

	} else {
@@ -677,16 +673,16 @@ static void ep93xx_spi_dma_transfer(struct ep93xx_spi *espi) 
	struct spi_message *msg = espi->current_msg;

	struct spi_message *msg = espi->current_msg;

	struct dma_async_tx_descriptor *rxd, *txd;

	struct dma_async_tx_descriptor *rxd, *txd;





	rxd = ep93xx_spi_dma_prepare(espi, DMA_FROM_DEVICE);

	rxd = ep93xx_spi_dma_prepare(espi, DMA_DEV_TO_MEM);

	if (IS_ERR(rxd)) {

	if (IS_ERR(rxd)) {

		dev_err(&espi->pdev->dev, "DMA RX failed: %ld\n", PTR_ERR(rxd));

		dev_err(&espi->pdev->dev, "DMA RX failed: %ld\n", PTR_ERR(rxd));

		msg->status = PTR_ERR(rxd);

		msg->status = PTR_ERR(rxd);

		return;

		return;

	}

	}





	txd = ep93xx_spi_dma_prepare(espi, DMA_TO_DEVICE);

	txd = ep93xx_spi_dma_prepare(espi, DMA_MEM_TO_DEV);

	if (IS_ERR(txd)) {

	if (IS_ERR(txd)) {

		ep93xx_spi_dma_finish(espi, DMA_FROM_DEVICE);

		ep93xx_spi_dma_finish(espi, DMA_DEV_TO_MEM);

		dev_err(&espi->pdev->dev, "DMA TX failed: %ld\n", PTR_ERR(rxd));

		dev_err(&espi->pdev->dev, "DMA TX failed: %ld\n", PTR_ERR(rxd));

		msg->status = PTR_ERR(txd);

		msg->status = PTR_ERR(txd);

		return;

		return;
@@ -705,8 +701,8 @@ static void ep93xx_spi_dma_transfer(struct ep93xx_spi *espi) 




	wait_for_completion(&espi->wait);

	wait_for_completion(&espi->wait);





	ep93xx_spi_dma_finish(espi, DMA_TO_DEVICE);

	ep93xx_spi_dma_finish(espi, DMA_MEM_TO_DEV);

	ep93xx_spi_dma_finish(espi, DMA_FROM_DEVICE);

	ep93xx_spi_dma_finish(espi, DMA_DEV_TO_MEM);

}

}





/**

/**