Unverified Commit 768d59f5 authored Mar 19, 2018 by Stefan Agner Committed by Mark Brown Mar 20, 2018

spi: rspi: use correct enum for DMA transfer direction



Use enum dma_transfer_direction as required by dmaengine_prep_slave_sg
instead of enum dma_data_direction. This won't change behavior in
practice as the enum values are equivalent.

This fixes two warnings when building with clang:
  drivers/spi/spi-rspi.c:538:26: warning: implicit conversion from enumeration
      type 'enum dma_data_direction' to different enumeration type
      'enum dma_transfer_direction' [-Wenum-conversion]
                                        rx->sgl, rx->nents, DMA_FROM_DEVICE,
                                                            ^~~~~~~~~~~~~~~
  drivers/spi/spi-rspi.c:558:26: warning: implicit conversion from enumeration
      type 'enum dma_data_direction' to different enumeration type
      'enum dma_transfer_direction' [-Wenum-conversion]
                                        tx->sgl, tx->nents, DMA_TO_DEVICE,
                                                            ^~~~~~~~~~~~~

Signed-off-by: Stefan Agner <stefan@agner.ch>
Signed-off-by: Mark Brown <broonie@kernel.org>

parent 7928b2cb

drivers/spi/spi-rspi.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -535,7 +535,7 @@ static int rspi_dma_transfer(struct rspi_data rspi, struct sg_table tx,
		/* First prepare and submit the DMA request(s), as this may fail */
		if (rx) {
		desc_rx = dmaengine_prep_slave_sg(rspi->master->dma_rx,
		rx->sgl, rx->nents, DMA_FROM_DEVICE,
		rx->sgl, rx->nents, DMA_DEV_TO_MEM,
		DMA_PREP_INTERRUPT \| DMA_CTRL_ACK);
		if (!desc_rx) {
		ret = -EAGAIN;
		@@ -555,7 +555,7 @@ static int rspi_dma_transfer(struct rspi_data rspi, struct sg_table tx,

		if (tx) {
		desc_tx = dmaengine_prep_slave_sg(rspi->master->dma_tx,
		tx->sgl, tx->nents, DMA_TO_DEVICE,
		tx->sgl, tx->nents, DMA_MEM_TO_DEV,
		DMA_PREP_INTERRUPT \| DMA_CTRL_ACK);
		if (!desc_tx) {
		ret = -EAGAIN;

Admin message