diff options
| author | Christoph Hellwig <hch@lst.de> | 2017-11-21 14:23:37 +0100 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2018-03-03 15:50:38 +0000 |
| commit | 0d3385ab636b47a61f12798b3205cec4548a8547 (patch) | |
| tree | 6fe5f1109cc97aa8c503fb19e570b3a896d7923e /include | |
| parent | 0984cc102900d0d3f2ca2c441f6cc39c4fb4b9af (diff) | |
| download | linux-0d3385ab636b47a61f12798b3205cec4548a8547.tar.gz linux-0d3385ab636b47a61f12798b3205cec4548a8547.tar.bz2 linux-0d3385ab636b47a61f12798b3205cec4548a8547.zip | |
scsi: dma-mapping: always provide dma_get_cache_alignment
commit 860dd4424f344400b491b212ee4acb3a358ba9d9 upstream.
Provide the dummy version of dma_get_cache_alignment that always returns
1 even if CONFIG_HAS_DMA is not set, so that drivers and subsystems can
use it without ifdefs.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
[bwh: Backported to 3.2: Also delete the conflicting declaration in
<asm-generic/dma-mapping-broken.h>]
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-generic/dma-mapping-broken.h | 3 | ||||
| -rw-r--r-- | include/linux/dma-mapping.h | 2 |
2 files changed, 0 insertions, 5 deletions
diff --git a/include/asm-generic/dma-mapping-broken.h b/include/asm-generic/dma-mapping-broken.h index ccf7b4f34a3c..12ec4b1b2760 100644 --- a/include/asm-generic/dma-mapping-broken.h +++ b/include/asm-generic/dma-mapping-broken.h @@ -69,9 +69,6 @@ dma_supported(struct device *dev, u64 mask); extern int dma_set_mask(struct device *dev, u64 mask); -extern int -dma_get_cache_alignment(void); - extern void dma_cache_sync(struct device *dev, void *vaddr, size_t size, enum dma_data_direction direction); diff --git a/include/linux/dma-mapping.h b/include/linux/dma-mapping.h index e13117cbd2f7..4b46319ec497 100644 --- a/include/linux/dma-mapping.h +++ b/include/linux/dma-mapping.h @@ -130,7 +130,6 @@ static inline void *dma_zalloc_coherent(struct device *dev, size_t size, return ret; } -#ifdef CONFIG_HAS_DMA static inline int dma_get_cache_alignment(void) { #ifdef ARCH_DMA_MINALIGN @@ -138,7 +137,6 @@ static inline int dma_get_cache_alignment(void) #endif return 1; } -#endif /* flags for the coherent memory api */ #define DMA_MEMORY_MAP 0x01 |