mmc: sdhci: eliminate sdhci_of_host and sdhci_of_data

[pandora-kernel.git] / drivers / mmc / host / sdhci-of-hlwd.c

diff --git a/drivers/mmc/host/sdhci-of-hlwd.c b/drivers/mmc/host/sdhci-of-hlwd.c
index 68ddb75..380e896 100644 (file)
--- a/drivers/mmc/host/sdhci-of-hlwd.c
+++ b/drivers/mmc/host/sdhci-of-hlwd.c
@@ -51,15 +51,17 @@ static void sdhci_hlwd_writeb(struct sdhci_host *host, u8 val, int reg)
        udelay(SDHCI_HLWD_WRITE_DELAY);
 }
 
-struct sdhci_of_data sdhci_hlwd = {
+static struct sdhci_ops sdhci_hlwd_ops = {
+       .read_l = sdhci_be32bs_readl,
+       .read_w = sdhci_be32bs_readw,
+       .read_b = sdhci_be32bs_readb,
+       .write_l = sdhci_hlwd_writel,
+       .write_w = sdhci_hlwd_writew,
+       .write_b = sdhci_hlwd_writeb,
+};
+
+struct sdhci_pltfm_data sdhci_hlwd_pdata = {
        .quirks = SDHCI_QUIRK_32BIT_DMA_ADDR |
                  SDHCI_QUIRK_32BIT_DMA_SIZE,
-       .ops = {
-               .read_l = sdhci_be32bs_readl,
-               .read_w = sdhci_be32bs_readw,
-               .read_b = sdhci_be32bs_readb,
-               .write_l = sdhci_hlwd_writel,
-               .write_w = sdhci_hlwd_writew,
-               .write_b = sdhci_hlwd_writeb,
-       },
+       .ops = &sdhci_hlwd_ops,
 };