greybus: i2c: use the bundle struct device instead of the connector
authorGreg Kroah-Hartman <gregkh@google.com>
Wed, 14 Oct 2015 18:18:32 +0000 (11:18 -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 i2c driver to use the bundle pointer instead of the
connection pointer.

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Reviewed-by: Alex Elder <elder@linaro.org>
drivers/staging/greybus/i2c.c

index bf6d11b..5a5af36 100644 (file)
@@ -118,7 +118,7 @@ gb_i2c_operation_create(struct gb_connection *connection,
        u32 i;
 
        if (msg_count > (u32)U16_MAX) {
-               dev_err(&connection->dev, "msg_count (%u) too big\n",
+               dev_err(&connection->bundle->dev, "msg_count (%u) too big\n",
                        msg_count);
                return NULL;
        }
@@ -312,7 +312,7 @@ static int gb_i2c_connection_init(struct gb_connection *connection)
        adapter->timeout = gb_i2c_dev->timeout_msec * HZ / 1000;
        adapter->retries = gb_i2c_dev->retries;
 
-       adapter->dev.parent = &connection->dev;
+       adapter->dev.parent = &connection->bundle->dev;
        snprintf(adapter->name, sizeof(adapter->name), "Greybus i2c adapter");
        i2c_set_adapdata(adapter, gb_i2c_dev);