greybus: spi: 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 spi 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>

diff --git a/drivers/staging/greybus/spi.c b/drivers/staging/greybus/spi.c
index 393f28ad099b2442b00f12b10470539e7d0f47b7..33e86f9c3182281b6f7c126aaa9246d1241910c3 100644 (file)
--- a/drivers/staging/greybus/spi.c
+++ b/drivers/staging/greybus/spi.c
@@ -57,7 +57,7 @@ gb_spi_operation_create(struct gb_connection *connection,
        /* Find number of transfers queued and tx/rx length in the message */
        list_for_each_entry(xfer, &msg->transfers, transfer_list) {
                if (!xfer->tx_buf && !xfer->rx_buf) {
-                       dev_err(&connection->dev,
+                       dev_err(&connection->bundle->dev,
                                "bufferless transfer, length %u\n", xfer->len);
                        return NULL;
                }
@@ -73,8 +73,8 @@ gb_spi_operation_create(struct gb_connection *connection,
 
        /* Too many transfers ? */
        if (count > (u32)U16_MAX) {
-               dev_err(&connection->dev, "transfer count (%u) too big\n",
-                       count);
+               dev_err(&connection->bundle->dev,
+                       "transfer count (%u) too big\n", count);
                return NULL;
        }
 
@@ -286,9 +286,9 @@ static int gb_spi_connection_init(struct gb_connection *connection)
        int ret;
 
        /* Allocate master with space for data */
-       master = spi_alloc_master(&connection->dev, sizeof(*spi));
+       master = spi_alloc_master(&connection->bundle->dev, sizeof(*spi));
        if (!master) {
-               dev_err(&connection->dev, "cannot alloc SPI master\n");
+               dev_err(&connection->bundle->dev, "cannot alloc SPI master\n");
                return -ENOMEM;
        }