Skip to content

Commit 567fd1d

Browse files
Qiang Liugregkh
authored andcommitted
carma: remove unnecessary DMA_INTERRUPT capability
These drivers set the DMA_INTERRUPT capability bit when requesting a DMA controller channel. This was historical, and is no longer needed. Recent changes to the drivers/dma/fsldma.c driver have removed support for this flag. This makes the carma drivers unable to find a DMA channel with the required capabilities. Cc: Arnd Bergmann <arnd@arndb.de> Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Signed-off-by: Ira W. Snyder <iws@ovro.caltech.edu> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent cfeb285 commit 567fd1d

File tree

2 files changed

+1
-2
lines changed

2 files changed

+1
-2
lines changed

drivers/misc/carma/carma-fpga-program.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -978,7 +978,6 @@ static int fpga_of_probe(struct platform_device *op)
978978
dev_set_drvdata(priv->dev, priv);
979979
dma_cap_zero(mask);
980980
dma_cap_set(DMA_MEMCPY, mask);
981-
dma_cap_set(DMA_INTERRUPT, mask);
982981
dma_cap_set(DMA_SLAVE, mask);
983982
dma_cap_set(DMA_SG, mask);
984983

drivers/misc/carma/carma-fpga.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -666,7 +666,7 @@ static int data_submit_dma(struct fpga_device *priv, struct data_buf *buf)
666666
src = SYS_FPGA_BLOCK;
667667
tx = chan->device->device_prep_dma_memcpy(chan, dst, src,
668668
REG_BLOCK_SIZE,
669-
DMA_PREP_INTERRUPT);
669+
0);
670670
if (!tx) {
671671
dev_err(priv->dev, "unable to prep SYS-FPGA DMA\n");
672672
return -ENOMEM;

0 commit comments

Comments
 (0)