greybus: tracing: assign "parent" id first

Most abstractions to be traced will have a sort of "parent" object
it is associated with, and an identifier for that parent is stored
with the as trace event data.  For example, the parent of a message
is the operation it's a part of, and the parent of an operation is
the connection it uses.

We'll arrange to define that parent id first in all events.  Most
abstractions already do this.  Move an interface's module id so it's
defined and assigned first.  The message traces are going to be
changed soon, so leave that one alone.

Signed-off-by: Alex Elder <elder@linaro.org>
Reviewed-by: Viresh Kumar <viresh.kumar@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>

diff --git a/drivers/staging/greybus/greybus_trace.h b/drivers/staging/greybus/greybus_trace.h
index 9d38cb31f81f876494e385f29362d07a33ec8bc4..5ecb504f0f65ee80bd30918cd2a771e8527688f0 100644 (file)
--- a/drivers/staging/greybus/greybus_trace.h
+++ b/drivers/staging/greybus/greybus_trace.h
@@ -168,8 +168,8 @@ DECLARE_EVENT_CLASS(gb_interface,
        TP_ARGS(intf),
 
        TP_STRUCT__entry(
-               __field(u8, id)         /* Interface id */
                __field(u8, module_id)
+               __field(u8, id)         /* Interface id */
                __field(u8, device_id)
                __field(int, disconnected)      /* bool */
                __field(int, ejected)           /* bool */
@@ -178,8 +178,8 @@ DECLARE_EVENT_CLASS(gb_interface,
        ),
 
        TP_fast_assign(
-               __entry->id = intf->interface_id;
                __entry->module_id = intf->module->module_id;
+               __entry->id = intf->interface_id;
                __entry->device_id = intf->device_id;
                __entry->disconnected = intf->disconnected;
                __entry->ejected = intf->ejected;