aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/dma-mapping.h
diff options
context:
space:
mode:
authorChristoph Hellwig <hch@lst.de>2017-11-21 14:23:37 +0100
committerMartin K. Petersen <martin.petersen@oracle.com>2017-11-21 23:05:00 -0500
commit860dd4424f344400b491b212ee4acb3a358ba9d9 (patch)
treea4b687a035a30fc37dfd1e0ba0e216e471193faa /include/linux/dma-mapping.h
parentscsi: ufs: ufshcd: fix potential NULL pointer dereference in ufshcd_config_vreg (diff)
downloadlinux-dev-860dd4424f344400b491b212ee4acb3a358ba9d9.tar.xz
linux-dev-860dd4424f344400b491b212ee4acb3a358ba9d9.zip
scsi: dma-mapping: always provide dma_get_cache_alignment
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. Cc: stable@vger.kernel.org Signed-off-by: Christoph Hellwig <hch@lst.de> Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Diffstat (limited to 'include/linux/dma-mapping.h')
-rw-r--r--include/linux/dma-mapping.h2
1 files changed, 0 insertions, 2 deletions
diff --git a/include/linux/dma-mapping.h b/include/linux/dma-mapping.h
index eee1499db396..29cfd18360be 100644
--- a/include/linux/dma-mapping.h
+++ b/include/linux/dma-mapping.h
@@ -710,7 +710,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
@@ -718,7 +717,6 @@ static inline int dma_get_cache_alignment(void)
#endif
return 1;
}
-#endif
/* flags for the coherent memory api */
#define DMA_MEMORY_EXCLUSIVE 0x01