OSDN Git Service

greybus: control: use the bundle struct device instead of the connector
authorGreg Kroah-Hartman <gregkh@google.com>
Wed, 14 Oct 2015 18:22:39 +0000 (11:22 -0700)
committerGreg Kroah-Hartman <gregkh@google.com>
Thu, 15 Oct 2015 16:19:15 +0000 (09:19 -0700)
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>
drivers/staging/greybus/control.c

index c092beb..630b5b6 100644 (file)
@@ -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;
                }