diff options
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/dma-mapping.h | 5 | ||||
| -rw-r--r-- | include/linux/swiotlb.h | 11 |
2 files changed, 0 insertions, 16 deletions
diff --git a/include/linux/dma-mapping.h b/include/linux/dma-mapping.h index 07dfd460d286..c0f6c3cd788c 100644 --- a/include/linux/dma-mapping.h +++ b/include/linux/dma-mapping.h | |||
| @@ -98,11 +98,6 @@ static inline int is_device_dma_capable(struct device *dev) | |||
| 98 | return dev->dma_mask != NULL && *dev->dma_mask != DMA_MASK_NONE; | 98 | return dev->dma_mask != NULL && *dev->dma_mask != DMA_MASK_NONE; |
| 99 | } | 99 | } |
| 100 | 100 | ||
| 101 | static inline int is_buffer_dma_capable(u64 mask, dma_addr_t addr, size_t size) | ||
| 102 | { | ||
| 103 | return addr + size <= mask; | ||
| 104 | } | ||
| 105 | |||
| 106 | #ifdef CONFIG_HAS_DMA | 101 | #ifdef CONFIG_HAS_DMA |
| 107 | #include <asm/dma-mapping.h> | 102 | #include <asm/dma-mapping.h> |
| 108 | #else | 103 | #else |
diff --git a/include/linux/swiotlb.h b/include/linux/swiotlb.h index cb1a6631b8f4..73b1f1cec423 100644 --- a/include/linux/swiotlb.h +++ b/include/linux/swiotlb.h | |||
| @@ -14,7 +14,6 @@ struct scatterlist; | |||
| 14 | */ | 14 | */ |
| 15 | #define IO_TLB_SEGSIZE 128 | 15 | #define IO_TLB_SEGSIZE 128 |
| 16 | 16 | ||
| 17 | |||
| 18 | /* | 17 | /* |
| 19 | * log of the size of each IO TLB slab. The number of slabs is command line | 18 | * log of the size of each IO TLB slab. The number of slabs is command line |
| 20 | * controllable. | 19 | * controllable. |
| @@ -24,16 +23,6 @@ struct scatterlist; | |||
| 24 | extern void | 23 | extern void |
| 25 | swiotlb_init(void); | 24 | swiotlb_init(void); |
| 26 | 25 | ||
| 27 | extern void *swiotlb_alloc_boot(size_t bytes, unsigned long nslabs); | ||
| 28 | extern void *swiotlb_alloc(unsigned order, unsigned long nslabs); | ||
| 29 | |||
| 30 | extern dma_addr_t swiotlb_phys_to_bus(struct device *hwdev, | ||
| 31 | phys_addr_t address); | ||
| 32 | extern phys_addr_t swiotlb_bus_to_phys(struct device *hwdev, | ||
| 33 | dma_addr_t address); | ||
| 34 | |||
| 35 | extern int swiotlb_arch_range_needs_mapping(phys_addr_t paddr, size_t size); | ||
| 36 | |||
| 37 | extern void | 26 | extern void |
| 38 | *swiotlb_alloc_coherent(struct device *hwdev, size_t size, | 27 | *swiotlb_alloc_coherent(struct device *hwdev, size_t size, |
| 39 | dma_addr_t *dma_handle, gfp_t flags); | 28 | dma_addr_t *dma_handle, gfp_t flags); |
