summaryrefslogtreecommitdiff
path: root/drivers/staging/greybus/control.c
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@google.com>2015-10-14 11:22:39 -0700
committerGreg Kroah-Hartman <gregkh@google.com>2015-10-15 09:19:15 -0700
commitdefa37ea9b9396ddc3ba9f556c1f89fec15c260b (patch)
tree1b8ed67b262b38b448744c26ef92fe14510d2dc1 /drivers/staging/greybus/control.c
parentc3aa6556659fe25b2fb27b86e65c6610b4066950 (diff)
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>
Diffstat (limited to 'drivers/staging/greybus/control.c')
-rw-r--r--drivers/staging/greybus/control.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/staging/greybus/control.c b/drivers/staging/greybus/control.c
index c092bebba77c..630b5b646667 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;
}