diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-09-12 13:30:06 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-09-12 13:30:06 -0700 |
commit | 52269718dc2cf2585d7a2828f31d46ef46e68000 (patch) | |
tree | 9815c6cbaa8c2e3247b6356725c150831dfd4d4e /drivers/scsi | |
parent | ae71948f398eb2572148006bf34f0c6d934206cb (diff) | |
parent | d35b0996fef3bfe76665e87bbff7d95c6807350a (diff) | |
download | linux-52269718dc2cf2585d7a2828f31d46ef46e68000.tar.gz linux-52269718dc2cf2585d7a2828f31d46ef46e68000.tar.bz2 linux-52269718dc2cf2585d7a2828f31d46ef46e68000.zip |
Merge tag 'dma-mapping-4.14' of git://git.infradead.org/users/hch/dma-mapping
Pull dma-mapping updates from Christoph Hellwig:
- removal of the old dma_alloc_noncoherent interface
- remove unused flags to dma_declare_coherent_memory
- restrict OF DMA configuration to specific physical busses
- use the iommu mailing list for dma-mapping questions and patches
* tag 'dma-mapping-4.14' of git://git.infradead.org/users/hch/dma-mapping:
dma-coherent: fix dma_declare_coherent_memory() logic error
ARM: imx: mx31moboard: Remove unused 'dma' variable
dma-coherent: remove an unused variable
MAINTAINERS: use the iommu list for the dma-mapping subsystem
dma-coherent: remove the DMA_MEMORY_MAP and DMA_MEMORY_IO flags
dma-coherent: remove the DMA_MEMORY_INCLUDES_CHILDREN flag
of: restrict DMA configuration
dma-mapping: remove dma_alloc_noncoherent and dma_free_noncoherent
i825xx: switch to switch to dma_alloc_attrs
au1000_eth: switch to dma_alloc_attrs
sgiseeq: switch to dma_alloc_attrs
dma-mapping: reduce dma_mapping_error inline bloat
Diffstat (limited to 'drivers/scsi')
-rw-r--r-- | drivers/scsi/NCR_Q720.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/scsi/NCR_Q720.c b/drivers/scsi/NCR_Q720.c index 05835bf1bf9c..54e7d26908ee 100644 --- a/drivers/scsi/NCR_Q720.c +++ b/drivers/scsi/NCR_Q720.c @@ -217,8 +217,7 @@ NCR_Q720_probe(struct device *dev) } if (dma_declare_coherent_memory(dev, base_addr, base_addr, - mem_size, DMA_MEMORY_MAP) - != DMA_MEMORY_MAP) { + mem_size, 0)) { printk(KERN_ERR "NCR_Q720: DMA declare memory failed\n"); goto out_release_region; } |