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

greybus: sdio: 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 sdio 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/sdio.c b/drivers/staging/greybus/sdio.c
index aaca70e19e4a5..b5e4af379e7bf 100644
--- a/drivers/staging/greybus/sdio.c
+++ b/drivers/staging/greybus/sdio.c
@@ -208,7 +208,7 @@ static int gb_sdio_event_recv(u8 type, struct gb_operation *op)
 	u8 event;
 
 	if (type != GB_SDIO_TYPE_EVENT) {
-		dev_err(&connection->dev,
+		dev_err(&connection->bundle->dev,
 			"unsupported unsolicited event: %u\n", type);
 		return -EINVAL;
 	}
@@ -707,7 +707,7 @@ static int gb_sdio_connection_init(struct gb_connection *connection)
 	size_t max_buffer;
 	int ret = 0;
 
-	mmc = mmc_alloc_host(sizeof(*host), &connection->dev);
+	mmc = mmc_alloc_host(sizeof(*host), &connection->bundle->dev);
 	if (!mmc)
 		return -ENOMEM;
 
@@ -739,7 +739,7 @@ static int gb_sdio_connection_init(struct gb_connection *connection)
 	mutex_init(&host->lock);
 	spin_lock_init(&host->xfer);
 	host->mrq_workqueue = alloc_workqueue("mmc-%s", 0, 1,
-						dev_name(&connection->dev));
+					      dev_name(&connection->bundle->dev));
 	if (!host->mrq_workqueue) {
 		ret = -ENOMEM;
 		goto free_buffer;