From: Rolf Eike Beer As suggested by Muli Ben-Yehuda this function is moved to generic code as may be useful for all archs. Signed-off-by: Rolf Eike Beer Signed-off-by: Andrew Morton --- diff -puN include/asm-x86_64/dma-mapping.h~move-valid_dma_direction-from-x86_64-to-generic-code include/asm-x86_64/dma-mapping.h --- a/include/asm-x86_64/dma-mapping.h~move-valid_dma_direction-from-x86_64-to-generic-code +++ a/include/asm-x86_64/dma-mapping.h @@ -55,13 +55,6 @@ extern dma_addr_t bad_dma_address; extern struct dma_mapping_ops* dma_ops; extern int iommu_merge; -static inline int valid_dma_direction(int dma_direction) -{ - return ((dma_direction == DMA_BIDIRECTIONAL) || - (dma_direction == DMA_TO_DEVICE) || - (dma_direction == DMA_FROM_DEVICE)); -} - static inline int dma_mapping_error(dma_addr_t dma_addr) { if (dma_ops->mapping_error) diff -puN include/linux/dma-mapping.h~move-valid_dma_direction-from-x86_64-to-generic-code include/linux/dma-mapping.h --- a/include/linux/dma-mapping.h~move-valid_dma_direction-from-x86_64-to-generic-code +++ a/include/linux/dma-mapping.h @@ -24,6 +24,13 @@ enum dma_data_direction { #define DMA_28BIT_MASK 0x000000000fffffffULL #define DMA_24BIT_MASK 0x0000000000ffffffULL +static inline int valid_dma_direction(int dma_direction) +{ + return ((dma_direction == DMA_BIDIRECTIONAL) || + (dma_direction == DMA_TO_DEVICE) || + (dma_direction == DMA_FROM_DEVICE)); +} + #include /* Backwards compat, remove in 2.7.x */ _