[PATCH master 3/3] mci: sdhci: populate struct sdhci::mci in drivers

[Ahmad Fatoum]

sdhci_wait_idle will make use of the mci's device to prefix error
messages, thus populate the field where it's still missing.

Reported-by: Jonas Richardsen <jonasrichardsen at emlix.com>
Signed-off-by: Ahmad Fatoum <a.fatoum at pengutronix.de>
---
 drivers/mci/atmel-sdhci.c | 1 +
 drivers/mci/dove-sdhci.c  | 1 +
 drivers/mci/tegra-sdmmc.c | 1 +
 3 files changed, 3 insertions(+)

diff --git a/drivers/mci/atmel-sdhci.c b/drivers/mci/atmel-sdhci.c
index c124e736bb7d..4082d1769537 100644
--- a/drivers/mci/atmel-sdhci.c
+++ b/drivers/mci/atmel-sdhci.c
@@ -139,6 +139,7 @@ static int at91_sdhci_probe(struct device *dev)
 						    "microchip,sdcal-inverted");
 
 	at91_sdhci_mmio_init(&priv->host, IOMEM(iores->start));
+	priv->host.sdhci.mci = &priv->mci;
 
 	priv->gck_rate = at91_sdhci_conf_clks(priv);
 	if (priv->gck_rate < 0)
diff --git a/drivers/mci/dove-sdhci.c b/drivers/mci/dove-sdhci.c
index d37046ad31bf..c370ace9e8f8 100644
--- a/drivers/mci/dove-sdhci.c
+++ b/drivers/mci/dove-sdhci.c
@@ -271,6 +271,7 @@ static int dove_sdhci_probe(struct device *dev)
 
 	host = xzalloc(sizeof(*host));
 	host->sdhci.base = dev_request_mem_region(dev, 0);
+	host->sdhci.mci = &host->mci;
 	host->mci.max_req_size = 0x8000;
 	host->mci.hw_dev = dev;
 	host->mci.send_cmd = dove_sdhci_mci_send_cmd;
diff --git a/drivers/mci/tegra-sdmmc.c b/drivers/mci/tegra-sdmmc.c
index e940edf3227a..10017146417d 100644
--- a/drivers/mci/tegra-sdmmc.c
+++ b/drivers/mci/tegra-sdmmc.c
@@ -401,6 +401,7 @@ static int tegra_sdmmc_probe(struct device *dev)
 
 	host->sdhci.read32 = tegra_sdmmc_read32;
 	host->sdhci.write32 = tegra_sdmmc_write32;
+	host->sdhci.mci = mci;
 
 	mci->hw_dev = dev;
 	mci->f_max = 48000000;
-- 
2.39.2