iommu/vt-d: Remove unused dma map/unmap trace events

With commit c588072bba6b5 ("iommu/vt-d: Convert intel iommu driver to
the iommu ops"), the trace events for dma map/unmap have no users any
more. Cleanup them to make the code neat.

Signed-off-by: Lu Baolu <baolu.lu@linux.intel.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Link: https://lore.kernel.org/r/20210323010600.678627-2-baolu.lu@linux.intel.com
Signed-off-by: Joerg Roedel <jroedel@suse.de>

diff --git a/include/trace/events/intel_iommu.h b/include/trace/events/intel_iommu.h
index e801f49..d233f29 100644 (file)
--- a/include/trace/events/intel_iommu.h
+++ b/include/trace/events/intel_iommu.h
@@ -15,126 +15,6 @@
 #include <linux/tracepoint.h>
 #include <linux/intel-iommu.h>
 
-DECLARE_EVENT_CLASS(dma_map,
-       TP_PROTO(struct device *dev, dma_addr_t dev_addr, phys_addr_t phys_addr,
-                size_t size),
-
-       TP_ARGS(dev, dev_addr, phys_addr, size),
-
-       TP_STRUCT__entry(
-               __string(dev_name, dev_name(dev))
-               __field(dma_addr_t, dev_addr)
-               __field(phys_addr_t, phys_addr)
-               __field(size_t, size)
-       ),
-
-       TP_fast_assign(
-               __assign_str(dev_name, dev_name(dev));
-               __entry->dev_addr = dev_addr;
-               __entry->phys_addr = phys_addr;
-               __entry->size = size;
-       ),
-
-       TP_printk("dev=%s dev_addr=0x%llx phys_addr=0x%llx size=%zu",
-                 __get_str(dev_name),
-                 (unsigned long long)__entry->dev_addr,
-                 (unsigned long long)__entry->phys_addr,
-                 __entry->size)
-);
-
-DEFINE_EVENT(dma_map, map_single,
-       TP_PROTO(struct device *dev, dma_addr_t dev_addr, phys_addr_t phys_addr,
-                size_t size),
-       TP_ARGS(dev, dev_addr, phys_addr, size)
-);
-
-DEFINE_EVENT(dma_map, bounce_map_single,
-       TP_PROTO(struct device *dev, dma_addr_t dev_addr, phys_addr_t phys_addr,
-                size_t size),
-       TP_ARGS(dev, dev_addr, phys_addr, size)
-);
-
-DECLARE_EVENT_CLASS(dma_unmap,
-       TP_PROTO(struct device *dev, dma_addr_t dev_addr, size_t size),
-
-       TP_ARGS(dev, dev_addr, size),
-
-       TP_STRUCT__entry(
-               __string(dev_name, dev_name(dev))
-               __field(dma_addr_t, dev_addr)
-               __field(size_t, size)
-       ),
-
-       TP_fast_assign(
-               __assign_str(dev_name, dev_name(dev));
-               __entry->dev_addr = dev_addr;
-               __entry->size = size;
-       ),
-
-       TP_printk("dev=%s dev_addr=0x%llx size=%zu",
-                 __get_str(dev_name),
-                 (unsigned long long)__entry->dev_addr,
-                 __entry->size)
-);
-
-DEFINE_EVENT(dma_unmap, unmap_single,
-       TP_PROTO(struct device *dev, dma_addr_t dev_addr, size_t size),
-       TP_ARGS(dev, dev_addr, size)
-);
-
-DEFINE_EVENT(dma_unmap, unmap_sg,
-       TP_PROTO(struct device *dev, dma_addr_t dev_addr, size_t size),
-       TP_ARGS(dev, dev_addr, size)
-);
-
-DEFINE_EVENT(dma_unmap, bounce_unmap_single,
-       TP_PROTO(struct device *dev, dma_addr_t dev_addr, size_t size),
-       TP_ARGS(dev, dev_addr, size)
-);
-
-DECLARE_EVENT_CLASS(dma_map_sg,
-       TP_PROTO(struct device *dev, int index, int total,
-                struct scatterlist *sg),
-
-       TP_ARGS(dev, index, total, sg),
-
-       TP_STRUCT__entry(
-               __string(dev_name, dev_name(dev))
-               __field(dma_addr_t, dev_addr)
-               __field(phys_addr_t, phys_addr)
-               __field(size_t, size)
-               __field(int, index)
-               __field(int, total)
-       ),
-
-       TP_fast_assign(
-               __assign_str(dev_name, dev_name(dev));
-               __entry->dev_addr = sg->dma_address;
-               __entry->phys_addr = sg_phys(sg);
-               __entry->size = sg->dma_length;
-               __entry->index = index;
-               __entry->total = total;
-       ),
-
-       TP_printk("dev=%s [%d/%d] dev_addr=0x%llx phys_addr=0x%llx size=%zu",
-                 __get_str(dev_name), __entry->index, __entry->total,
-                 (unsigned long long)__entry->dev_addr,
-                 (unsigned long long)__entry->phys_addr,
-                 __entry->size)
-);
-
-DEFINE_EVENT(dma_map_sg, map_sg,
-       TP_PROTO(struct device *dev, int index, int total,
-                struct scatterlist *sg),
-       TP_ARGS(dev, index, total, sg)
-);
-
-DEFINE_EVENT(dma_map_sg, bounce_map_sg,
-       TP_PROTO(struct device *dev, int index, int total,
-                struct scatterlist *sg),
-       TP_ARGS(dev, index, total, sg)
-);
-
 TRACE_EVENT(qi_submit,
        TP_PROTO(struct intel_iommu *iommu, u64 qw0, u64 qw1, u64 qw2, u64 qw3),