diff options
| -rw-r--r-- | arch/mips/include/asm/mach-ip27/dma-coherence.h | 4 | ||||
| -rw-r--r-- | arch/mips/include/asm/mach-ip32/dma-coherence.h | 4 | ||||
| -rw-r--r-- | arch/mips/include/asm/mach-jazz/dma-coherence.h | 8 |
3 files changed, 8 insertions, 8 deletions
diff --git a/arch/mips/include/asm/mach-ip27/dma-coherence.h b/arch/mips/include/asm/mach-ip27/dma-coherence.h index d3d04018a85..7aa5ef9c19b 100644 --- a/arch/mips/include/asm/mach-ip27/dma-coherence.h +++ b/arch/mips/include/asm/mach-ip27/dma-coherence.h | |||
| @@ -26,14 +26,14 @@ static inline dma_addr_t plat_map_dma_mem(struct device *dev, void *addr, | |||
| 26 | return pa; | 26 | return pa; |
| 27 | } | 27 | } |
| 28 | 28 | ||
| 29 | static dma_addr_t plat_map_dma_mem_page(struct device *dev, struct page *page) | 29 | static inline dma_addr_t plat_map_dma_mem_page(struct device *dev, struct page *page) |
| 30 | { | 30 | { |
| 31 | dma_addr_t pa = dev_to_baddr(dev, page_to_phys(page)); | 31 | dma_addr_t pa = dev_to_baddr(dev, page_to_phys(page)); |
| 32 | 32 | ||
| 33 | return pa; | 33 | return pa; |
| 34 | } | 34 | } |
| 35 | 35 | ||
| 36 | static unsigned long plat_dma_addr_to_phys(struct device *dev, | 36 | static inline unsigned long plat_dma_addr_to_phys(struct device *dev, |
| 37 | dma_addr_t dma_addr) | 37 | dma_addr_t dma_addr) |
| 38 | { | 38 | { |
| 39 | return dma_addr & ~(0xffUL << 56); | 39 | return dma_addr & ~(0xffUL << 56); |
diff --git a/arch/mips/include/asm/mach-ip32/dma-coherence.h b/arch/mips/include/asm/mach-ip32/dma-coherence.h index 37855955b31..55123fc0b2f 100644 --- a/arch/mips/include/asm/mach-ip32/dma-coherence.h +++ b/arch/mips/include/asm/mach-ip32/dma-coherence.h | |||
| @@ -37,7 +37,7 @@ static inline dma_addr_t plat_map_dma_mem(struct device *dev, void *addr, | |||
| 37 | return pa; | 37 | return pa; |
| 38 | } | 38 | } |
| 39 | 39 | ||
| 40 | static dma_addr_t plat_map_dma_mem_page(struct device *dev, struct page *page) | 40 | static inline dma_addr_t plat_map_dma_mem_page(struct device *dev, struct page *page) |
| 41 | { | 41 | { |
| 42 | dma_addr_t pa; | 42 | dma_addr_t pa; |
| 43 | 43 | ||
| @@ -50,7 +50,7 @@ static dma_addr_t plat_map_dma_mem_page(struct device *dev, struct page *page) | |||
| 50 | } | 50 | } |
| 51 | 51 | ||
| 52 | /* This is almost certainly wrong but it's what dma-ip32.c used to use */ | 52 | /* This is almost certainly wrong but it's what dma-ip32.c used to use */ |
| 53 | static unsigned long plat_dma_addr_to_phys(struct device *dev, | 53 | static inline unsigned long plat_dma_addr_to_phys(struct device *dev, |
| 54 | dma_addr_t dma_addr) | 54 | dma_addr_t dma_addr) |
| 55 | { | 55 | { |
| 56 | unsigned long addr = dma_addr & RAM_OFFSET_MASK; | 56 | unsigned long addr = dma_addr & RAM_OFFSET_MASK; |
diff --git a/arch/mips/include/asm/mach-jazz/dma-coherence.h b/arch/mips/include/asm/mach-jazz/dma-coherence.h index f93aee59454..2a10920473e 100644 --- a/arch/mips/include/asm/mach-jazz/dma-coherence.h +++ b/arch/mips/include/asm/mach-jazz/dma-coherence.h | |||
| @@ -12,23 +12,23 @@ | |||
| 12 | 12 | ||
| 13 | struct device; | 13 | struct device; |
| 14 | 14 | ||
| 15 | static dma_addr_t plat_map_dma_mem(struct device *dev, void *addr, size_t size) | 15 | static inline dma_addr_t plat_map_dma_mem(struct device *dev, void *addr, size_t size) |
| 16 | { | 16 | { |
| 17 | return vdma_alloc(virt_to_phys(addr), size); | 17 | return vdma_alloc(virt_to_phys(addr), size); |
| 18 | } | 18 | } |
| 19 | 19 | ||
| 20 | static dma_addr_t plat_map_dma_mem_page(struct device *dev, struct page *page) | 20 | static inline dma_addr_t plat_map_dma_mem_page(struct device *dev, struct page *page) |
| 21 | { | 21 | { |
| 22 | return vdma_alloc(page_to_phys(page), PAGE_SIZE); | 22 | return vdma_alloc(page_to_phys(page), PAGE_SIZE); |
| 23 | } | 23 | } |
| 24 | 24 | ||
| 25 | static unsigned long plat_dma_addr_to_phys(struct device *dev, | 25 | static inline unsigned long plat_dma_addr_to_phys(struct device *dev, |
| 26 | dma_addr_t dma_addr) | 26 | dma_addr_t dma_addr) |
| 27 | { | 27 | { |
| 28 | return vdma_log2phys(dma_addr); | 28 | return vdma_log2phys(dma_addr); |
| 29 | } | 29 | } |
| 30 | 30 | ||
| 31 | static void plat_unmap_dma_mem(struct device *dev, dma_addr_t dma_addr, | 31 | static inline void plat_unmap_dma_mem(struct device *dev, dma_addr_t dma_addr, |
| 32 | size_t size, enum dma_data_direction direction) | 32 | size_t size, enum dma_data_direction direction) |
| 33 | { | 33 | { |
| 34 | vdma_free(dma_addr); | 34 | vdma_free(dma_addr); |