greybus: protocol: handle static connections

Use host-device device and connection name for log messages, as not all
connections have a bundle.

Note that the "initial" svc connection has never had a bundle.

Signed-off-by: Johan Hovold <johan@hovoldconsulting.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>

diff --git a/drivers/staging/greybus/protocol.c b/drivers/staging/greybus/protocol.c
index 1790d1ac85131b6613f7902f2696118646d9d7bc..47b74799090267be07a2969b1cb62c1565ef28bd 100644 (file)
--- a/drivers/staging/greybus/protocol.c
+++ b/drivers/staging/greybus/protocol.c
@@ -165,9 +165,9 @@ int gb_protocol_get_version(struct gb_connection *connection)
                return retval;
 
        if (response.major > connection->protocol->major) {
-               dev_err(&connection->bundle->dev,
-                       "%d: unsupported major version (%hhu > %hhu)\n",
-                       connection->intf_cport_id, response.major,
+               dev_err(&connection->hd->dev,
+                       "%s: unsupported major version (%hhu > %hhu)\n",
+                       connection->name, response.major,
                        connection->protocol->major);
                return -ENOTSUPP;
        }
@@ -175,8 +175,8 @@ int gb_protocol_get_version(struct gb_connection *connection)
        connection->module_major = response.major;
        connection->module_minor = response.minor;
 
-       dev_dbg(&connection->bundle->dev,
-               "%d: %s (0x%02hhx) v%hhu.%hhu\n", connection->intf_cport_id,
+       dev_dbg(&connection->hd->dev,
+               "%s: %s (0x%02hhx) v%hhu.%hhu\n", connection->name,
                protocol->name, protocol->id, response.major, response.minor);
 
        return 0;