From 87757e325ab8b5b9e0e90e37de77778a631e6c8c Mon Sep 17 00:00:00 2001 From: Johan Hovold Date: Wed, 25 Nov 2015 15:59:17 +0100 Subject: [PATCH] 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 Signed-off-by: Greg Kroah-Hartman --- drivers/staging/greybus/protocol.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/staging/greybus/protocol.c b/drivers/staging/greybus/protocol.c index 1790d1ac8513..47b747990902 100644 --- 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; -- 2.20.1