mmc: sdhci: eliminate sdhci_of_host and sdhci_of_data

The patch migrates the use of sdhci_of_host and sdhci_of_data to
sdhci_pltfm_host and sdhci_pltfm_data, so that the former pair can
be eliminated.

Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Reviewed-by: Grant Likely <grant.likely@secretlab.ca>
Reviewed-by: Wolfram Sang <w.sang@pengutronix.de>
Acked-by: Anton Vorontsov <cbouatmailru@gmail.com>
Signed-off-by: Chris Ball <cjb@laptop.org>

1 files changed, 19 insertions, 17 deletions

diff --git a/drivers/mmc/host/sdhci-of-esdhc.c b/drivers/mmc/host/sdhci-of-esdhc.c
index ba40d6d035c7..492bcd72180a 100644
--- a/drivers/mmc/host/sdhci-of-esdhc.c
+++ b/drivers/mmc/host/sdhci-of-esdhc.c
@@ -60,32 +60,34 @@ static int esdhc_of_enable_dma(struct sdhci_host *host)
 
 static unsigned int esdhc_of_get_max_clock(struct sdhci_host *host)
 {
-        struct sdhci_of_host *of_host = sdhci_priv(host);
+        struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host);
 
-        return of_host->clock;
+        return pltfm_host->clock;
 }
 
 static unsigned int esdhc_of_get_min_clock(struct sdhci_host *host)
 {
-        struct sdhci_of_host *of_host = sdhci_priv(host);
+        struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host);
 
-        return of_host->clock / 256 / 16;
+        return pltfm_host->clock / 256 / 16;
 }
 
-struct sdhci_of_data sdhci_esdhc = {
+static struct sdhci_ops sdhci_esdhc_ops = {
+        .read_l = sdhci_be32bs_readl,
+        .read_w = esdhc_readw,
+        .read_b = sdhci_be32bs_readb,
+        .write_l = sdhci_be32bs_writel,
+        .write_w = esdhc_writew,
+        .write_b = esdhc_writeb,
+        .set_clock = esdhc_set_clock,
+        .enable_dma = esdhc_of_enable_dma,
+        .get_max_clock = esdhc_of_get_max_clock,
+        .get_min_clock = esdhc_of_get_min_clock,
+};
+
+struct sdhci_pltfm_data sdhci_esdhc_pdata = {
         /* card detection could be handled via GPIO */
         .quirks = ESDHC_DEFAULT_QUIRKS | SDHCI_QUIRK_BROKEN_CARD_DETECTION
                 | SDHCI_QUIRK_NO_CARD_NO_RESET,
-        .ops = {
-                .read_l = sdhci_be32bs_readl,
-                .read_w = esdhc_readw,
-                .read_b = sdhci_be32bs_readb,
-                .write_l = sdhci_be32bs_writel,
-                .write_w = esdhc_writew,
-                .write_b = esdhc_writeb,
-                .set_clock = esdhc_set_clock,
-                .enable_dma = esdhc_of_enable_dma,
-                .get_max_clock = esdhc_of_get_max_clock,
-                .get_min_clock = esdhc_of_get_min_clock,
-        },
+        .ops = &sdhci_esdhc_ops,
 };