From: Greg Kroah-Hartman <gregkh@google.com>
Date: Wed, 14 Oct 2015 18:22:39 +0000 (-0700)
Subject: greybus: control: use the bundle struct device instead of the connector
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=defa37ea9b9396ddc3ba9f556c1f89fec15c260b;p=linux.git

greybus: control: 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 control code to use the bundle pointer instead
of the connection pointer for printing out error messages.

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

diff --git a/drivers/staging/greybus/control.c b/drivers/staging/greybus/control.c
index c092bebba77c2..630b5b6466673 100644
--- a/drivers/staging/greybus/control.c
+++ b/drivers/staging/greybus/control.c
@@ -22,7 +22,7 @@ int gb_control_get_manifest_size_operation(struct gb_interface *intf)
 	ret = gb_operation_sync(connection, GB_CONTROL_TYPE_GET_MANIFEST_SIZE,
 				NULL, 0, &response, sizeof(response));
 	if (ret) {
-		dev_err(&connection->dev,
+		dev_err(&connection->bundle->dev,
 			"%s: Manifest size get operation failed (%d)\n",
 			__func__, ret);
 		return ret;
@@ -74,7 +74,7 @@ static int gb_control_request_recv(u8 type, struct gb_operation *op)
 	case GB_REQUEST_TYPE_PROTOCOL_VERSION:
 		if (!gb_operation_response_alloc(op, sizeof(*version),
 						 GFP_KERNEL)) {
-			dev_err(&connection->dev,
+			dev_err(&connection->bundle->dev,
 				"%s: error allocating response\n", __func__);
 			return -ENOMEM;
 		}