Merge tag 'trace-assign-str-v6.10' of git://git.kernel.org/pub/scm/linux/kernel/git...

[linux-block.git] / include / trace / events / iommu.h

diff --git a/include/trace/events/iommu.h b/include/trace/events/iommu.h
index 70743db1fb758fcc7a541d737a0776cd5544923f..373007e567cb827458a729b8200bbcc1b7d76912 100644 (file)
--- a/include/trace/events/iommu.h
+++ b/include/trace/events/iommu.h
@@ -28,7 +28,7 @@ DECLARE_EVENT_CLASS(iommu_group_event,
 
        TP_fast_assign(
                __entry->gid = group_id;
-               __assign_str(device, dev_name(dev));
+               __assign_str(device);
        ),
 
        TP_printk("IOMMU: groupID=%d device=%s",
@@ -62,7 +62,7 @@ DECLARE_EVENT_CLASS(iommu_device_event,
        ),
 
        TP_fast_assign(
-               __assign_str(device, dev_name(dev));
+               __assign_str(device);
        ),
 
        TP_printk("IOMMU: device=%s", __get_str(device)
@@ -138,8 +138,8 @@ DECLARE_EVENT_CLASS(iommu_error,
        ),
 
        TP_fast_assign(
-               __assign_str(device, dev_name(dev));
-               __assign_str(driver, dev_driver_string(dev));
+               __assign_str(device);
+               __assign_str(driver);
                __entry->iova = iova;
                __entry->flags = flags;
        ),