Skip to content

Commit 76bb7c4

Browse files
rleonmszyprow
authored andcommitted
dma-mapping: rename trace_dma_*map_page to trace_dma_*map_phys
As a preparation for following map_page -> map_phys API conversion, let's rename trace_dma_*map_page() to be trace_dma_*map_phys(). Reviewed-by: Jason Gunthorpe <jgg@nvidia.com> Signed-off-by: Leon Romanovsky <leonro@nvidia.com> Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com> Link: https://lore.kernel.org/r/c0c02d7d8bd4a148072d283353ba227516a76682.1757423202.git.leonro@nvidia.com
1 parent e9e81d8 commit 76bb7c4

2 files changed

Lines changed: 4 additions & 4 deletions

File tree

include/trace/events/dma.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ DEFINE_EVENT(dma_map, name, \
7272
size_t size, enum dma_data_direction dir, unsigned long attrs), \
7373
TP_ARGS(dev, phys_addr, dma_addr, size, dir, attrs))
7474

75-
DEFINE_MAP_EVENT(dma_map_page);
75+
DEFINE_MAP_EVENT(dma_map_phys);
7676
DEFINE_MAP_EVENT(dma_map_resource);
7777

7878
DECLARE_EVENT_CLASS(dma_unmap,
@@ -110,7 +110,7 @@ DEFINE_EVENT(dma_unmap, name, \
110110
enum dma_data_direction dir, unsigned long attrs), \
111111
TP_ARGS(dev, addr, size, dir, attrs))
112112

113-
DEFINE_UNMAP_EVENT(dma_unmap_page);
113+
DEFINE_UNMAP_EVENT(dma_unmap_phys);
114114
DEFINE_UNMAP_EVENT(dma_unmap_resource);
115115

116116
DECLARE_EVENT_CLASS(dma_alloc_class,

kernel/dma/mapping.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@ dma_addr_t dma_map_page_attrs(struct device *dev, struct page *page,
173173
else
174174
addr = ops->map_page(dev, page, offset, size, dir, attrs);
175175
kmsan_handle_dma(page, offset, size, dir);
176-
trace_dma_map_page(dev, phys, addr, size, dir, attrs);
176+
trace_dma_map_phys(dev, phys, addr, size, dir, attrs);
177177
debug_dma_map_phys(dev, phys, size, dir, addr, attrs);
178178

179179
return addr;
@@ -193,7 +193,7 @@ void dma_unmap_page_attrs(struct device *dev, dma_addr_t addr, size_t size,
193193
iommu_dma_unmap_page(dev, addr, size, dir, attrs);
194194
else
195195
ops->unmap_page(dev, addr, size, dir, attrs);
196-
trace_dma_unmap_page(dev, addr, size, dir, attrs);
196+
trace_dma_unmap_phys(dev, addr, size, dir, attrs);
197197
debug_dma_unmap_phys(dev, addr, size, dir);
198198
}
199199
EXPORT_SYMBOL(dma_unmap_page_attrs);

0 commit comments

Comments
 (0)