diff options
Diffstat (limited to 'arch/nios2/mm')
-rw-r--r-- | arch/nios2/mm/dma-mapping.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/arch/nios2/mm/dma-mapping.c b/arch/nios2/mm/dma-mapping.c index 90422c367ed3..d800fad87896 100644 --- a/arch/nios2/mm/dma-mapping.c +++ b/arch/nios2/mm/dma-mapping.c | |||
@@ -59,7 +59,7 @@ static inline void __dma_sync_for_cpu(void *vaddr, size_t size, | |||
59 | } | 59 | } |
60 | 60 | ||
61 | static void *nios2_dma_alloc(struct device *dev, size_t size, | 61 | static void *nios2_dma_alloc(struct device *dev, size_t size, |
62 | dma_addr_t *dma_handle, gfp_t gfp, struct dma_attrs *attrs) | 62 | dma_addr_t *dma_handle, gfp_t gfp, unsigned long attrs) |
63 | { | 63 | { |
64 | void *ret; | 64 | void *ret; |
65 | 65 | ||
@@ -84,7 +84,7 @@ static void *nios2_dma_alloc(struct device *dev, size_t size, | |||
84 | } | 84 | } |
85 | 85 | ||
86 | static void nios2_dma_free(struct device *dev, size_t size, void *vaddr, | 86 | static void nios2_dma_free(struct device *dev, size_t size, void *vaddr, |
87 | dma_addr_t dma_handle, struct dma_attrs *attrs) | 87 | dma_addr_t dma_handle, unsigned long attrs) |
88 | { | 88 | { |
89 | unsigned long addr = (unsigned long) CAC_ADDR((unsigned long) vaddr); | 89 | unsigned long addr = (unsigned long) CAC_ADDR((unsigned long) vaddr); |
90 | 90 | ||
@@ -93,7 +93,7 @@ static void nios2_dma_free(struct device *dev, size_t size, void *vaddr, | |||
93 | 93 | ||
94 | static int nios2_dma_map_sg(struct device *dev, struct scatterlist *sg, | 94 | static int nios2_dma_map_sg(struct device *dev, struct scatterlist *sg, |
95 | int nents, enum dma_data_direction direction, | 95 | int nents, enum dma_data_direction direction, |
96 | struct dma_attrs *attrs) | 96 | unsigned long attrs) |
97 | { | 97 | { |
98 | int i; | 98 | int i; |
99 | 99 | ||
@@ -113,7 +113,7 @@ static int nios2_dma_map_sg(struct device *dev, struct scatterlist *sg, | |||
113 | static dma_addr_t nios2_dma_map_page(struct device *dev, struct page *page, | 113 | static dma_addr_t nios2_dma_map_page(struct device *dev, struct page *page, |
114 | unsigned long offset, size_t size, | 114 | unsigned long offset, size_t size, |
115 | enum dma_data_direction direction, | 115 | enum dma_data_direction direction, |
116 | struct dma_attrs *attrs) | 116 | unsigned long attrs) |
117 | { | 117 | { |
118 | void *addr = page_address(page) + offset; | 118 | void *addr = page_address(page) + offset; |
119 | 119 | ||
@@ -123,14 +123,14 @@ static dma_addr_t nios2_dma_map_page(struct device *dev, struct page *page, | |||
123 | 123 | ||
124 | static void nios2_dma_unmap_page(struct device *dev, dma_addr_t dma_address, | 124 | static void nios2_dma_unmap_page(struct device *dev, dma_addr_t dma_address, |
125 | size_t size, enum dma_data_direction direction, | 125 | size_t size, enum dma_data_direction direction, |
126 | struct dma_attrs *attrs) | 126 | unsigned long attrs) |
127 | { | 127 | { |
128 | __dma_sync_for_cpu(phys_to_virt(dma_address), size, direction); | 128 | __dma_sync_for_cpu(phys_to_virt(dma_address), size, direction); |
129 | } | 129 | } |
130 | 130 | ||
131 | static void nios2_dma_unmap_sg(struct device *dev, struct scatterlist *sg, | 131 | static void nios2_dma_unmap_sg(struct device *dev, struct scatterlist *sg, |
132 | int nhwentries, enum dma_data_direction direction, | 132 | int nhwentries, enum dma_data_direction direction, |
133 | struct dma_attrs *attrs) | 133 | unsigned long attrs) |
134 | { | 134 | { |
135 | void *addr; | 135 | void *addr; |
136 | int i; | 136 | int i; |