blk-mq: introduce BLK_STS_DEV_RESOURCE

[mirror_ubuntu-bionic-kernel.git] / include / linux / dma-mapping.h

diff --git a/include/linux/dma-mapping.h b/include/linux/dma-mapping.h
index e8f8e8fb244d649830dfc499163a1e8a7d0e476f..fccf6855e95064fd94670cb1f0f7f0db956ebc60 100644 (file)
--- a/include/linux/dma-mapping.h
+++ b/include/linux/dma-mapping.h
@@ -663,8 +663,7 @@ static inline unsigned int dma_get_max_seg_size(struct device *dev)
        return SZ_64K;
 }
 
-static inline unsigned int dma_set_max_seg_size(struct device *dev,
-                                               unsigned int size)
+static inline int dma_set_max_seg_size(struct device *dev, unsigned int size)
 {
        if (dev->dma_parms) {
                dev->dma_parms->max_segment_size = size;
@@ -704,7 +703,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
@@ -712,7 +710,6 @@ static inline int dma_get_cache_alignment(void)
 #endif
        return 1;
 }
-#endif
 
 /* flags for the coherent memory api */
 #define DMA_MEMORY_EXCLUSIVE           0x01