Skip to content

Commit d9c55c9

Browse files
arndbbroonie
authored andcommitted
spi: cadence-quadspi: fix dma_unmap_single() call
There are separate constants for the dma-mapping API and the dmaengine API, mixing them up causes a warning in some builds: In file included from drivers/spi/spi-cadence-quadspi.c:12: drivers/spi/spi-cadence-quadspi.c: In function 'cqspi_versal_indirect_read_dma': drivers/spi/spi-cadence-quadspi.c:950:55: error: implicit conversion from 'enum dma_transfer_direction' to 'enum dma_data_direction' [-Werror=enum-conversion] 950 | dma_unmap_single(dev, dma_addr, bytes_to_dma, DMA_DEV_TO_MEM); | ^~~~~~~~~~~~~~ include/linux/dma-mapping.h:407:70: note: in definition of macro 'dma_unmap_single' 407 | #define dma_unmap_single(d, a, s, r) dma_unmap_single_attrs(d, a, s, r, 0) | ^ Fixes: 1a6f854 ("spi: cadence-quadspi: Add Xilinx Versal external DMA support") Signed-off-by: Arnd Bergmann <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Mark Brown <[email protected]>
1 parent 7dc9b95 commit d9c55c9

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

drivers/spi/spi-cadence-quadspi.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -947,7 +947,7 @@ static int cqspi_versal_indirect_read_dma(struct cqspi_flash_pdata *f_pdata,
947947
writel(CQSPI_REG_INDIRECTWR_CANCEL_MASK,
948948
reg_base + CQSPI_REG_INDIRECTRD);
949949

950-
dma_unmap_single(dev, dma_addr, bytes_to_dma, DMA_DEV_TO_MEM);
950+
dma_unmap_single(dev, dma_addr, bytes_to_dma, DMA_FROM_DEVICE);
951951

952952
reg = readl(cqspi->iobase + CQSPI_REG_CONFIG);
953953
reg &= ~CQSPI_REG_CONFIG_DMA_MASK;

0 commit comments

Comments
 (0)