scsi: dma-mapping: always provide dma_get_cache_alignment
authorChristoph Hellwig <hch@lst.de>
Tue, 21 Nov 2017 13:23:37 +0000 (14:23 +0100)
committerMartin K. Petersen <martin.petersen@oracle.com>
Wed, 22 Nov 2017 04:05:00 +0000 (23:05 -0500)
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>
include/linux/dma-mapping.h

index eee1499db3964d8393fa83becddca3e51eaa815e..29cfd18360be55bffce5222c4d6a9f1920e035ab 100644 (file)
@@ -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