greybus: tracing: reorder trace definitions

Move the definition of the module trace events below those for the
interface.  We'll define them in an order that represents a sort of
layering of the abstractions (note not all of these are defined yet):
    message
    operation
    connection
    bundle
    interface
    module
    host device
Other tracepoints (like perhaps some tied to timesync) will go at the
beginning or end.

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 7157a67..cd930ea 100644 (file)
--- a/drivers/staging/greybus/greybus_trace.h
+++ b/drivers/staging/greybus/greybus_trace.h
@@ -161,59 +161,6 @@ DEFINE_OPERATION_EVENT(gb_operation_put_active);
 
 #undef DEFINE_OPERATION_EVENT
 
-DECLARE_EVENT_CLASS(gb_module,
-
-       TP_PROTO(struct gb_module *module),
-
-       TP_ARGS(module),
-
-       TP_STRUCT__entry(
-               __field(int, hd_bus_id)
-               __field(u8, module_id)
-               __field(u8, num_interfaces)
-               __field(int, disconnected)      /* bool */
-       ),
-
-       TP_fast_assign(
-               __entry->hd_bus_id = module->hd->bus_id;
-               __entry->module_id = module->module_id;
-               __entry->disconnected = module->disconnected;
-       ),
-
-       TP_printk("greybus: hd_bus_id=%d module_id=%hhu disconnected=%d",
-               __entry->hd_bus_id, __entry->module_id, __entry->disconnected)
-);
-
-#define DEFINE_MODULE_EVENT(name)                                      \
-               DEFINE_EVENT(gb_module, name,                           \
-                               TP_PROTO(struct gb_module *module),     \
-                               TP_ARGS(module))
-
-/*
- * Occurs after a new module is successfully created, before
- * creating any of its interfaces.
- */
-DEFINE_MODULE_EVENT(gb_module_create);
-
-/*
- * Occurs after the last reference to a module has been dropped.
- */
-DEFINE_MODULE_EVENT(gb_module_release);
-
-/*
- * Occurs after a module is successfully created, before registering
- * any of its interfaces.
- */
-DEFINE_MODULE_EVENT(gb_module_add);
-
-/*
- * Occurs when a module is deleted, before deregistering its
- * interfaces.
- */
-DEFINE_MODULE_EVENT(gb_module_del);
-
-#undef DEFINE_MODULE_EVENT
-
 DECLARE_EVENT_CLASS(gb_interface,
 
        TP_PROTO(struct gb_interface *intf),
@@ -294,6 +241,59 @@ DEFINE_INTERFACE_EVENT(gb_interface_disable);
 
 #undef DEFINE_INTERFACE_EVENT
 
+DECLARE_EVENT_CLASS(gb_module,
+
+       TP_PROTO(struct gb_module *module),
+
+       TP_ARGS(module),
+
+       TP_STRUCT__entry(
+               __field(int, hd_bus_id)
+               __field(u8, module_id)
+               __field(u8, num_interfaces)
+               __field(int, disconnected)      /* bool */
+       ),
+
+       TP_fast_assign(
+               __entry->hd_bus_id = module->hd->bus_id;
+               __entry->module_id = module->module_id;
+               __entry->disconnected = module->disconnected;
+       ),
+
+       TP_printk("greybus: hd_bus_id=%d module_id=%hhu disconnected=%d",
+               __entry->hd_bus_id, __entry->module_id, __entry->disconnected)
+);
+
+#define DEFINE_MODULE_EVENT(name)                                      \
+               DEFINE_EVENT(gb_module, name,                           \
+                               TP_PROTO(struct gb_module *module),     \
+                               TP_ARGS(module))
+
+/*
+ * Occurs after a new module is successfully created, before
+ * creating any of its interfaces.
+ */
+DEFINE_MODULE_EVENT(gb_module_create);
+
+/*
+ * Occurs after the last reference to a module has been dropped.
+ */
+DEFINE_MODULE_EVENT(gb_module_release);
+
+/*
+ * Occurs after a module is successfully created, before registering
+ * any of its interfaces.
+ */
+DEFINE_MODULE_EVENT(gb_module_add);
+
+/*
+ * Occurs when a module is deleted, before deregistering its
+ * interfaces.
+ */
+DEFINE_MODULE_EVENT(gb_module_del);
+
+#undef DEFINE_MODULE_EVENT
+
 DECLARE_EVENT_CLASS(gb_host_device,
 
        TP_PROTO(struct gb_host_device *hd),