diff options
-rw-r--r-- | drivers/gpu/nvgpu/os/linux/nvidia_p2p.c | 10 | ||||
-rw-r--r-- | include/linux/nv-p2p.h | 8 |
2 files changed, 9 insertions, 9 deletions
diff --git a/drivers/gpu/nvgpu/os/linux/nvidia_p2p.c b/drivers/gpu/nvgpu/os/linux/nvidia_p2p.c index 11d27b47..2b0211da 100644 --- a/drivers/gpu/nvgpu/os/linux/nvidia_p2p.c +++ b/drivers/gpu/nvgpu/os/linux/nvidia_p2p.c | |||
@@ -167,7 +167,7 @@ int nvidia_p2p_free_page_table(struct nvidia_p2p_page_table *page_table) | |||
167 | } | 167 | } |
168 | EXPORT_SYMBOL(nvidia_p2p_free_page_table); | 168 | EXPORT_SYMBOL(nvidia_p2p_free_page_table); |
169 | 169 | ||
170 | int nvidia_p2p_map_pages(struct device *dev, | 170 | int nvidia_p2p_dma_map_pages(struct device *dev, |
171 | struct nvidia_p2p_page_table *page_table, | 171 | struct nvidia_p2p_page_table *page_table, |
172 | struct nvidia_p2p_dma_mapping **dma_mapping, | 172 | struct nvidia_p2p_dma_mapping **dma_mapping, |
173 | enum dma_data_direction direction) | 173 | enum dma_data_direction direction) |
@@ -254,9 +254,9 @@ free_dma_mapping: | |||
254 | 254 | ||
255 | return ret; | 255 | return ret; |
256 | } | 256 | } |
257 | EXPORT_SYMBOL(nvidia_p2p_map_pages); | 257 | EXPORT_SYMBOL(nvidia_p2p_dma_map_pages); |
258 | 258 | ||
259 | int nvidia_p2p_unmap_pages(struct nvidia_p2p_dma_mapping *dma_mapping) | 259 | int nvidia_p2p_dma_unmap_pages(struct nvidia_p2p_dma_mapping *dma_mapping) |
260 | { | 260 | { |
261 | struct nvidia_p2p_page_table *page_table = NULL; | 261 | struct nvidia_p2p_page_table *page_table = NULL; |
262 | 262 | ||
@@ -287,10 +287,10 @@ int nvidia_p2p_unmap_pages(struct nvidia_p2p_dma_mapping *dma_mapping) | |||
287 | 287 | ||
288 | return 0; | 288 | return 0; |
289 | } | 289 | } |
290 | EXPORT_SYMBOL(nvidia_p2p_unmap_pages); | 290 | EXPORT_SYMBOL(nvidia_p2p_dma_unmap_pages); |
291 | 291 | ||
292 | int nvidia_p2p_free_dma_mapping(struct nvidia_p2p_dma_mapping *dma_mapping) | 292 | int nvidia_p2p_free_dma_mapping(struct nvidia_p2p_dma_mapping *dma_mapping) |
293 | { | 293 | { |
294 | return nvidia_p2p_unmap_pages(dma_mapping); | 294 | return nvidia_p2p_dma_unmap_pages(dma_mapping); |
295 | } | 295 | } |
296 | EXPORT_SYMBOL(nvidia_p2p_free_dma_mapping); | 296 | EXPORT_SYMBOL(nvidia_p2p_free_dma_mapping); |
diff --git a/include/linux/nv-p2p.h b/include/linux/nv-p2p.h index 40e82796..137519b7 100644 --- a/include/linux/nv-p2p.h +++ b/include/linux/nv-p2p.h | |||
@@ -159,13 +159,13 @@ int nvidia_p2p_free_page_table(struct nvidia_p2p_page_table *page_table); | |||
159 | * 0 upon successful completion. | 159 | * 0 upon successful completion. |
160 | * Negative number if any other error | 160 | * Negative number if any other error |
161 | */ | 161 | */ |
162 | int nvidia_p2p_map_pages(struct device *dev, | 162 | int nvidia_p2p_dma_map_pages(struct device *dev, |
163 | struct nvidia_p2p_page_table *page_table, | 163 | struct nvidia_p2p_page_table *page_table, |
164 | struct nvidia_p2p_dma_mapping **map, | 164 | struct nvidia_p2p_dma_mapping **map, |
165 | enum dma_data_direction direction); | 165 | enum dma_data_direction direction); |
166 | /* | 166 | /* |
167 | * @brief | 167 | * @brief |
168 | * Unmap the pages previously mapped using nvidia_p2p_map_pages | 168 | * Unmap the pages previously mapped using nvidia_p2p_dma_map_pages |
169 | * | 169 | * |
170 | * @param[in] *map | 170 | * @param[in] *map |
171 | * A pointer to struct nvidia_p2p_dma_mapping. | 171 | * A pointer to struct nvidia_p2p_dma_mapping. |
@@ -175,11 +175,11 @@ int nvidia_p2p_map_pages(struct device *dev, | |||
175 | * 0 upon successful completion. | 175 | * 0 upon successful completion. |
176 | * Negative number if any other error | 176 | * Negative number if any other error |
177 | */ | 177 | */ |
178 | int nvidia_p2p_unmap_pages(struct nvidia_p2p_dma_mapping *map); | 178 | int nvidia_p2p_dma_unmap_pages(struct nvidia_p2p_dma_mapping *map); |
179 | 179 | ||
180 | /* | 180 | /* |
181 | * @brief | 181 | * @brief |
182 | * Unmap the pages previously mapped using nvidia_p2p_map_pages. | 182 | * Unmap the pages previously mapped using nvidia_p2p_dma_map_pages. |
183 | * This is called during the execution of the free_callback(). | 183 | * This is called during the execution of the free_callback(). |
184 | * | 184 | * |
185 | * @param[in] *map | 185 | * @param[in] *map |