tracing/treewide: Remove second parameter of __assign_str()

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

diff --git a/include/trace/events/devlink.h b/include/trace/events/devlink.h
index 77ff7cfc6049a6fa724ad27fd33428a169d643f2..f241e204fe6b9913b695ffde073e61c5ddd30d7d 100644 (file)
--- a/include/trace/events/devlink.h
+++ b/include/trace/events/devlink.h
@@ -31,9 +31,9 @@ TRACE_EVENT(devlink_hwmsg,
        ),
 
        TP_fast_assign(
-               __assign_str(bus_name, devlink_to_dev(devlink)->bus->name);
-               __assign_str(dev_name, dev_name(devlink_to_dev(devlink)));
-               __assign_str(driver_name, devlink_to_dev(devlink)->driver->name);
+               __assign_str(bus_name);
+               __assign_str(dev_name);
+               __assign_str(driver_name);
                __entry->incoming = incoming;
                __entry->type = type;
                memcpy(__get_dynamic_array(buf), buf, len);
@@ -63,11 +63,11 @@ TRACE_EVENT(devlink_hwerr,
                ),
 
        TP_fast_assign(
-               __assign_str(bus_name, devlink_to_dev(devlink)->bus->name);
-               __assign_str(dev_name, dev_name(devlink_to_dev(devlink)));
-               __assign_str(driver_name, devlink_to_dev(devlink)->driver->name);
+               __assign_str(bus_name);
+               __assign_str(dev_name);
+               __assign_str(driver_name);
                __entry->err = err;
-               __assign_str(msg, msg);
+               __assign_str(msg);
                ),
 
        TP_printk("bus_name=%s dev_name=%s driver_name=%s err=%d %s",
@@ -93,11 +93,11 @@ TRACE_EVENT(devlink_health_report,
        ),
 
        TP_fast_assign(
-               __assign_str(bus_name, devlink_to_dev(devlink)->bus->name);
-               __assign_str(dev_name, dev_name(devlink_to_dev(devlink)));
-               __assign_str(driver_name, devlink_to_dev(devlink)->driver->name);
-               __assign_str(reporter_name, reporter_name);
-               __assign_str(msg, msg);
+               __assign_str(bus_name);
+               __assign_str(dev_name);
+               __assign_str(driver_name);
+               __assign_str(reporter_name);
+               __assign_str(msg);
        ),
 
        TP_printk("bus_name=%s dev_name=%s driver_name=%s reporter_name=%s: %s",
@@ -125,10 +125,10 @@ TRACE_EVENT(devlink_health_recover_aborted,
        ),
 
        TP_fast_assign(
-               __assign_str(bus_name, devlink_to_dev(devlink)->bus->name);
-               __assign_str(dev_name, dev_name(devlink_to_dev(devlink)));
-               __assign_str(driver_name, devlink_to_dev(devlink)->driver->name);
-               __assign_str(reporter_name, reporter_name);
+               __assign_str(bus_name);
+               __assign_str(dev_name);
+               __assign_str(driver_name);
+               __assign_str(reporter_name);
                __entry->health_state = health_state;
                __entry->time_since_last_recover = time_since_last_recover;
        ),
@@ -158,10 +158,10 @@ TRACE_EVENT(devlink_health_reporter_state_update,
        ),
 
        TP_fast_assign(
-               __assign_str(bus_name, devlink_to_dev(devlink)->bus->name);
-               __assign_str(dev_name, dev_name(devlink_to_dev(devlink)));
-               __assign_str(driver_name, devlink_to_dev(devlink)->driver->name);
-               __assign_str(reporter_name, reporter_name);
+               __assign_str(bus_name);
+               __assign_str(dev_name);
+               __assign_str(driver_name);
+               __assign_str(reporter_name);
                __entry->new_state = new_state;
        ),
 
@@ -192,11 +192,11 @@ TRACE_EVENT(devlink_trap_report,
        TP_fast_assign(
                struct net_device *input_dev = metadata->input_dev;
 
-               __assign_str(bus_name, devlink_to_dev(devlink)->bus->name);
-               __assign_str(dev_name, dev_name(devlink_to_dev(devlink)));
-               __assign_str(driver_name, devlink_to_dev(devlink)->driver->name);
-               __assign_str(trap_name, metadata->trap_name);
-               __assign_str(trap_group_name, metadata->trap_group_name);
+               __assign_str(bus_name);
+               __assign_str(dev_name);
+               __assign_str(driver_name);
+               __assign_str(trap_name);
+               __assign_str(trap_group_name);
                strscpy(__entry->input_dev_name, input_dev ? input_dev->name : "NULL", IFNAMSIZ);
        ),