summaryrefslogtreecommitdiffstats
path: root/drivers/spi/spi-atmel.c
diff options
context:
space:
mode:
authorStefan Agner <stefan@agner.ch>2018-03-24 06:48:00 -0400
committerMark Brown <broonie@kernel.org>2018-03-27 22:42:48 -0400
commit357325764d7eabc4d2169d26af079b441fd48bc5 (patch)
tree6dd27e84ec8c8a6ee6ff1d7a5692a8e2689920ba /drivers/spi/spi-atmel.c
parent9581329eff9db72ab4fbb46a594fd7fdda3c51b0 (diff)
spi: spi-atmel: Use correct enum for DMA transfer direction
Use enum dma_transfer_direction as required by the functions dmaengine_prep_slave_(sg|single)() 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-atmel.c:771:12: warning: implicit conversion from enumeration type 'enum dma_data_direction' to different enumeration type 'enum dma_transfer_direction' [-Wenum-conversion] DMA_FROM_DEVICE, ^~~~~~~~~~~~~~~ ... Signed-off-by: Stefan Agner <stefan@agner.ch> Acked-by: Nicolas Ferre <nicolas.ferre@microchip.com> Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be> Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'drivers/spi/spi-atmel.c')
-rw-r--r--drivers/spi/spi-atmel.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/spi/spi-atmel.c b/drivers/spi/spi-atmel.c
index b7936f815373..3f890d162934 100644
--- a/drivers/spi/spi-atmel.c
+++ b/drivers/spi/spi-atmel.c
@@ -768,14 +768,14 @@ static int atmel_spi_next_xfer_dma_submit(struct spi_master *master,
768 rxdesc = dmaengine_prep_slave_single(rxchan, 768 rxdesc = dmaengine_prep_slave_single(rxchan,
769 as->dma_addr_rx_bbuf, 769 as->dma_addr_rx_bbuf,
770 xfer->len, 770 xfer->len,
771 DMA_FROM_DEVICE, 771 DMA_DEV_TO_MEM,
772 DMA_PREP_INTERRUPT | 772 DMA_PREP_INTERRUPT |
773 DMA_CTRL_ACK); 773 DMA_CTRL_ACK);
774 } else { 774 } else {
775 rxdesc = dmaengine_prep_slave_sg(rxchan, 775 rxdesc = dmaengine_prep_slave_sg(rxchan,
776 xfer->rx_sg.sgl, 776 xfer->rx_sg.sgl,
777 xfer->rx_sg.nents, 777 xfer->rx_sg.nents,
778 DMA_FROM_DEVICE, 778 DMA_DEV_TO_MEM,
779 DMA_PREP_INTERRUPT | 779 DMA_PREP_INTERRUPT |
780 DMA_CTRL_ACK); 780 DMA_CTRL_ACK);
781 } 781 }
@@ -787,14 +787,14 @@ static int atmel_spi_next_xfer_dma_submit(struct spi_master *master,
787 memcpy(as->addr_tx_bbuf, xfer->tx_buf, xfer->len); 787 memcpy(as->addr_tx_bbuf, xfer->tx_buf, xfer->len);
788 txdesc = dmaengine_prep_slave_single(txchan, 788 txdesc = dmaengine_prep_slave_single(txchan,
789 as->dma_addr_tx_bbuf, 789 as->dma_addr_tx_bbuf,
790 xfer->len, DMA_TO_DEVICE, 790 xfer->len, DMA_MEM_TO_DEV,
791 DMA_PREP_INTERRUPT | 791 DMA_PREP_INTERRUPT |
792 DMA_CTRL_ACK); 792 DMA_CTRL_ACK);
793 } else { 793 } else {
794 txdesc = dmaengine_prep_slave_sg(txchan, 794 txdesc = dmaengine_prep_slave_sg(txchan,
795 xfer->tx_sg.sgl, 795 xfer->tx_sg.sgl,
796 xfer->tx_sg.nents, 796 xfer->tx_sg.nents,
797 DMA_TO_DEVICE, 797 DMA_MEM_TO_DEV,
798 DMA_PREP_INTERRUPT | 798 DMA_PREP_INTERRUPT |
799 DMA_CTRL_ACK); 799 DMA_CTRL_ACK);
800 } 800 }