greybus: greybus_trace: use the bundle struct device instead of the connector

We are removing struct device from the gb_connection structure in the
near future.  The gb_bundle structure's struct device should be used as
a replacement.

This patch moves the greybus trace code to use the bundle pointer
instead of the connection pointer when printing out tracing messages.

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

diff --git a/drivers/staging/greybus/greybus_trace.h b/drivers/staging/greybus/greybus_trace.h
index 6c88d34d6f5d4aaad6672cb59427105b34b66a7d..e5e3cc0ce0a8c8252be1dbe7cc4d3f31682f1d32 100644 (file)
--- a/drivers/staging/greybus/greybus_trace.h
+++ b/drivers/staging/greybus/greybus_trace.h
@@ -24,7 +24,7 @@ DECLARE_EVENT_CLASS(gb_message,
        TP_ARGS(message),
 
        TP_STRUCT__entry(
-               __string(name, dev_name(&message->operation->connection->dev))
+               __string(name, dev_name(&message->operation->connection->bundle->dev))
                __field(u16, op_id)
                __field(u16, intf_cport_id)
                __field(u16, hd_cport_id)
@@ -32,7 +32,7 @@ DECLARE_EVENT_CLASS(gb_message,
        ),
 
        TP_fast_assign(
-               __assign_str(name, dev_name(&message->operation->connection->dev))
+               __assign_str(name, dev_name(&message->operation->connection->bundle->dev))
                __entry->op_id = message->operation->id;
                __entry->intf_cport_id =
                        message->operation->connection->intf_cport_id;