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

diff --git a/include/trace/events/dma.h b/include/trace/events/dma.h
index ee90d6f1dcf357d234d5d6222e82e3070fcb466f..84416c7d6bfaa918cc52f6858d9776faaa05939c 100644 (file)
--- a/include/trace/events/dma.h
+++ b/include/trace/events/dma.h
@@ -72,7 +72,7 @@ DEFINE_EVENT(dma_map, name, \
                 size_t size, enum dma_data_direction dir, unsigned long attrs), \
        TP_ARGS(dev, phys_addr, dma_addr, size, dir, attrs))
 
-DEFINE_MAP_EVENT(dma_map_page);
+DEFINE_MAP_EVENT(dma_map_phys);
 DEFINE_MAP_EVENT(dma_map_resource);
 
 DECLARE_EVENT_CLASS(dma_unmap,
@@ -110,7 +110,7 @@ DEFINE_EVENT(dma_unmap, name, \
                 enum dma_data_direction dir, unsigned long attrs), \
        TP_ARGS(dev, addr, size, dir, attrs))
 
-DEFINE_UNMAP_EVENT(dma_unmap_page);
+DEFINE_UNMAP_EVENT(dma_unmap_phys);
 DEFINE_UNMAP_EVENT(dma_unmap_resource);
 
 DECLARE_EVENT_CLASS(dma_alloc_class,

diff --git a/kernel/dma/mapping.c b/kernel/dma/mapping.c
index 0b7e16c69bf18d69f04314985cdcb80cf30f2ec8..bd3bb6d59d72261c7d84ab9df11f82ab6f7fba63 100644 (file)
--- a/kernel/dma/mapping.c
+++ b/kernel/dma/mapping.c
@@ -173,7 +173,7 @@ dma_addr_t dma_map_page_attrs(struct device *dev, struct page *page,
        else
                addr = ops->map_page(dev, page, offset, size, dir, attrs);
        kmsan_handle_dma(page, offset, size, dir);
-       trace_dma_map_page(dev, phys, addr, size, dir, attrs);
+       trace_dma_map_phys(dev, phys, addr, size, dir, attrs);
        debug_dma_map_phys(dev, phys, size, dir, addr, attrs);
 
        return addr;
@@ -193,7 +193,7 @@ void dma_unmap_page_attrs(struct device *dev, dma_addr_t addr, size_t size,
                iommu_dma_unmap_page(dev, addr, size, dir, attrs);
        else
                ops->unmap_page(dev, addr, size, dir, attrs);
-       trace_dma_unmap_page(dev, addr, size, dir, attrs);
+       trace_dma_unmap_phys(dev, addr, size, dir, attrs);
        debug_dma_unmap_phys(dev, addr, size, dir);
 }
 EXPORT_SYMBOL(dma_unmap_page_attrs);