spi: cadence-quadspi: fix dma_unmap_single() call
PATCH 1/1 spi: cadence-quadspi: fix dma_unmap_single() call
From: Arnd Bergmann <[email protected]>
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)
| ^
--- drivers/spi/spi-cadence-quadspi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/spi/spi-cadence-quadspi.c +1 -1
@@ -947,7 +947,7 @@ static int cqspi_versal_indirect_read_dma(struct cqspi_flash_pdata *f_pdata,writel (CQSPI_REG_INDIRECTWR_CANCEL_MASK , reg_base +CQSPI_REG_INDIRECTRD ); -dma_unmap_single (dev, dma_addr, bytes_to_dma,DMA_DEV_TO_MEM ); +dma_unmap_single (dev, dma_addr, bytes_to_dma,DMA_FROM_DEVICE ); reg =readl (cqspi->iobase +CQSPI_REG_CONFIG ); reg &= ~CQSPI_REG_CONFIG_DMA_MASK ;
Signature · 1 line
2.29.2
Mark Brown
maintainerQuoted 14 lines · Arnd Bergmann
From: Arnd Bergmann <[email protected]>
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 'enumdma_transfer_direction' to 'enumdma_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 | #definedma_unmap_single(d, a, s, r)dma_unmap_single_attrs(d, a, s, r, 0)
| ^
Quoted 1 line
[...]
Applied to
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git for-next
Thanks!
[1/1] spi: cadence-quadspi: fix dma_unmap_single() call
commit: d9c55c95a3eac8536fbc6ef39dee69d3716aeee2
All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying to this mail.
Thanks,
Mark