mmc: sdhci-of-esdhc: use sdhci_pltfm_init for private allocation

Commit 0e748234293f ("mmc: sdhci: Add size for caller in init+register")
allows users of sdhci_pltfm to allocate private space in calls to
sdhci_pltfm_init+sdhci_pltfm_register. This patch migrates the
sdhci-of-esdhc driver to this allocation.

Signed-off-by: Jisheng Zhang <jszhang@marvell.com>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Adrian Hunter <adrian.hunter@intel.com>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>

diff --git a/drivers/mmc/host/sdhci-of-esdhc.c b/drivers/mmc/host/sdhci-of-esdhc.c
index 83b1226471c186cff0fb22cf92c7c43294f5581e..3f34d354f1fc2720b70c5527c1be695d68734de1 100644 (file)
--- a/drivers/mmc/host/sdhci-of-esdhc.c
+++ b/drivers/mmc/host/sdhci-of-esdhc.c
@@ -49,7 +49,7 @@ static u32 esdhc_readl_fixup(struct sdhci_host *host,
                                     int spec_reg, u32 value)
 {
        struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host);
-       struct sdhci_esdhc *esdhc = pltfm_host->priv;
+       struct sdhci_esdhc *esdhc = sdhci_pltfm_priv(pltfm_host);
        u32 ret;
 
        /*
@@ -354,7 +354,7 @@ static void esdhc_le_writeb(struct sdhci_host *host, u8 val, int reg)
 static void esdhc_of_adma_workaround(struct sdhci_host *host, u32 intmask)
 {
        struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host);
-       struct sdhci_esdhc *esdhc = pltfm_host->priv;
+       struct sdhci_esdhc *esdhc = sdhci_pltfm_priv(pltfm_host);
        bool applicable;
        dma_addr_t dmastart;
        dma_addr_t dmanow;
@@ -404,7 +404,7 @@ static unsigned int esdhc_of_get_min_clock(struct sdhci_host *host)
 static void esdhc_of_set_clock(struct sdhci_host *host, unsigned int clock)
 {
        struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host);
-       struct sdhci_esdhc *esdhc = pltfm_host->priv;
+       struct sdhci_esdhc *esdhc = sdhci_pltfm_priv(pltfm_host);
        int pre_div = 1;
        int div = 1;
        u32 temp;
@@ -569,15 +569,12 @@ static void esdhc_init(struct platform_device *pdev, struct sdhci_host *host)
        u16 host_ver;
 
        pltfm_host = sdhci_priv(host);
-       esdhc = devm_kzalloc(&pdev->dev, sizeof(struct sdhci_esdhc),
-                            GFP_KERNEL);
+       esdhc = sdhci_pltfm_priv(pltfm_host);
 
        host_ver = sdhci_readw(host, SDHCI_HOST_VERSION);
        esdhc->vendor_ver = (host_ver & SDHCI_VENDOR_VER_MASK) >>
                             SDHCI_VENDOR_VER_SHIFT;
        esdhc->spec_ver = host_ver & SDHCI_SPEC_VER_MASK;
-
-       pltfm_host->priv = esdhc;
 }
 
 static int sdhci_esdhc_probe(struct platform_device *pdev)
@@ -591,9 +588,11 @@ static int sdhci_esdhc_probe(struct platform_device *pdev)
        np = pdev->dev.of_node;
 
        if (of_get_property(np, "little-endian", NULL))
-               host = sdhci_pltfm_init(pdev, &sdhci_esdhc_le_pdata, 0);
+               host = sdhci_pltfm_init(pdev, &sdhci_esdhc_le_pdata,
+                                       sizeof(struct sdhci_esdhc));
        else
-               host = sdhci_pltfm_init(pdev, &sdhci_esdhc_be_pdata, 0);
+               host = sdhci_pltfm_init(pdev, &sdhci_esdhc_be_pdata,
+                                       sizeof(struct sdhci_esdhc));
 
        if (IS_ERR(host))
                return PTR_ERR(host);
@@ -603,7 +602,7 @@ static int sdhci_esdhc_probe(struct platform_device *pdev)
        sdhci_get_of_property(pdev);
 
        pltfm_host = sdhci_priv(host);
-       esdhc = pltfm_host->priv;
+       esdhc = sdhci_pltfm_priv(pltfm_host);
        if (esdhc->vendor_ver == VENDOR_V_22)
                host->quirks2 |= SDHCI_QUIRK2_HOST_NO_CMD23;