diff options
Diffstat (limited to 'include/linux/io-mapping.h')
| -rw-r--r-- | include/linux/io-mapping.h | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/include/linux/io-mapping.h b/include/linux/io-mapping.h index 7fb592793738..8cdcc2a199ad 100644 --- a/include/linux/io-mapping.h +++ b/include/linux/io-mapping.h | |||
| @@ -81,8 +81,7 @@ io_mapping_free(struct io_mapping *mapping) | |||
| 81 | /* Atomic map/unmap */ | 81 | /* Atomic map/unmap */ |
| 82 | static inline void __iomem * | 82 | static inline void __iomem * |
| 83 | io_mapping_map_atomic_wc(struct io_mapping *mapping, | 83 | io_mapping_map_atomic_wc(struct io_mapping *mapping, |
| 84 | unsigned long offset, | 84 | unsigned long offset) |
| 85 | int slot) | ||
| 86 | { | 85 | { |
| 87 | resource_size_t phys_addr; | 86 | resource_size_t phys_addr; |
| 88 | unsigned long pfn; | 87 | unsigned long pfn; |
| @@ -90,13 +89,13 @@ io_mapping_map_atomic_wc(struct io_mapping *mapping, | |||
| 90 | BUG_ON(offset >= mapping->size); | 89 | BUG_ON(offset >= mapping->size); |
| 91 | phys_addr = mapping->base + offset; | 90 | phys_addr = mapping->base + offset; |
| 92 | pfn = (unsigned long) (phys_addr >> PAGE_SHIFT); | 91 | pfn = (unsigned long) (phys_addr >> PAGE_SHIFT); |
| 93 | return iomap_atomic_prot_pfn(pfn, slot, mapping->prot); | 92 | return iomap_atomic_prot_pfn(pfn, mapping->prot); |
| 94 | } | 93 | } |
| 95 | 94 | ||
| 96 | static inline void | 95 | static inline void |
| 97 | io_mapping_unmap_atomic(void __iomem *vaddr, int slot) | 96 | io_mapping_unmap_atomic(void __iomem *vaddr) |
| 98 | { | 97 | { |
| 99 | iounmap_atomic(vaddr, slot); | 98 | iounmap_atomic(vaddr); |
| 100 | } | 99 | } |
| 101 | 100 | ||
| 102 | static inline void __iomem * | 101 | static inline void __iomem * |
| @@ -137,14 +136,13 @@ io_mapping_free(struct io_mapping *mapping) | |||
| 137 | /* Atomic map/unmap */ | 136 | /* Atomic map/unmap */ |
| 138 | static inline void __iomem * | 137 | static inline void __iomem * |
| 139 | io_mapping_map_atomic_wc(struct io_mapping *mapping, | 138 | io_mapping_map_atomic_wc(struct io_mapping *mapping, |
| 140 | unsigned long offset, | 139 | unsigned long offset) |
| 141 | int slot) | ||
| 142 | { | 140 | { |
| 143 | return ((char __force __iomem *) mapping) + offset; | 141 | return ((char __force __iomem *) mapping) + offset; |
| 144 | } | 142 | } |
| 145 | 143 | ||
| 146 | static inline void | 144 | static inline void |
| 147 | io_mapping_unmap_atomic(void __iomem *vaddr, int slot) | 145 | io_mapping_unmap_atomic(void __iomem *vaddr) |
| 148 | { | 146 | { |
| 149 | } | 147 | } |
| 150 | 148 | ||
