From 1531675269c8339866fc49fdb1d1142966aedabe Mon Sep 17 00:00:00 2001 From: Jisheng Zhang Date: Tue, 16 Feb 2016 21:08:28 +0800 Subject: mmc: sdhci-st: 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 sdhci-st to this allocation. Signed-off-by: Jisheng Zhang Acked-by: Arnd Bergmann Acked-by: Adrian Hunter Signed-off-by: Ulf Hansson --- drivers/mmc/host/sdhci-st.c | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) (limited to 'drivers/mmc') diff --git a/drivers/mmc/host/sdhci-st.c b/drivers/mmc/host/sdhci-st.c index 969c2b0..320e1c2 100644 --- a/drivers/mmc/host/sdhci-st.c +++ b/drivers/mmc/host/sdhci-st.c @@ -251,7 +251,7 @@ static int sdhci_st_set_dll_for_clock(struct sdhci_host *host) { int ret = 0; struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host); - struct st_mmc_platform_data *pdata = pltfm_host->priv; + struct st_mmc_platform_data *pdata = sdhci_pltfm_priv(pltfm_host); if (host->clock > CLK_TO_CHECK_DLL_LOCK) { st_mmcss_set_dll(pdata->top_ioaddr); @@ -265,7 +265,7 @@ static void sdhci_st_set_uhs_signaling(struct sdhci_host *host, unsigned int uhs) { struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host); - struct st_mmc_platform_data *pdata = pltfm_host->priv; + struct st_mmc_platform_data *pdata = sdhci_pltfm_priv(pltfm_host); u16 ctrl_2 = sdhci_readw(host, SDHCI_HOST_CONTROL2); int ret = 0; @@ -357,10 +357,7 @@ static int sdhci_st_probe(struct platform_device *pdev) int ret = 0; u16 host_version; struct resource *res; - - pdata = devm_kzalloc(&pdev->dev, sizeof(*pdata), GFP_KERNEL); - if (!pdata) - return -ENOMEM; + struct reset_control *rstc; clk = devm_clk_get(&pdev->dev, "mmc"); if (IS_ERR(clk)) { @@ -368,19 +365,23 @@ static int sdhci_st_probe(struct platform_device *pdev) return PTR_ERR(clk); } - pdata->rstc = devm_reset_control_get(&pdev->dev, NULL); - if (IS_ERR(pdata->rstc)) - pdata->rstc = NULL; + rstc = devm_reset_control_get(&pdev->dev, NULL); + if (IS_ERR(rstc)) + rstc = NULL; else - reset_control_deassert(pdata->rstc); + reset_control_deassert(rstc); - host = sdhci_pltfm_init(pdev, &sdhci_st_pdata, 0); + host = sdhci_pltfm_init(pdev, &sdhci_st_pdata, sizeof(*pdata)); if (IS_ERR(host)) { dev_err(&pdev->dev, "Failed sdhci_pltfm_init\n"); ret = PTR_ERR(host); goto err_pltfm_init; } + pltfm_host = sdhci_priv(host); + pdata = sdhci_pltfm_priv(pltfm_host); + pdata->rstc = rstc; + ret = mmc_of_parse(host->mmc); if (ret) { dev_err(&pdev->dev, "Failed mmc_of_parse\n"); @@ -398,8 +399,6 @@ static int sdhci_st_probe(struct platform_device *pdev) pdata->top_ioaddr = NULL; } - pltfm_host = sdhci_priv(host); - pltfm_host->priv = pdata; pltfm_host->clk = clk; /* Configure the Arasan HC inside the flashSS */ @@ -427,8 +426,8 @@ err_out: err_of: sdhci_pltfm_free(pdev); err_pltfm_init: - if (pdata->rstc) - reset_control_assert(pdata->rstc); + if (rstc) + reset_control_assert(rstc); return ret; } @@ -437,13 +436,14 @@ static int sdhci_st_remove(struct platform_device *pdev) { struct sdhci_host *host = platform_get_drvdata(pdev); struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host); - struct st_mmc_platform_data *pdata = pltfm_host->priv; + struct st_mmc_platform_data *pdata = sdhci_pltfm_priv(pltfm_host); + struct reset_control *rstc = pdata->rstc; int ret; ret = sdhci_pltfm_unregister(pdev); - if (pdata->rstc) - reset_control_assert(pdata->rstc); + if (rstc) + reset_control_assert(rstc); return ret; } @@ -453,7 +453,7 @@ static int sdhci_st_suspend(struct device *dev) { struct sdhci_host *host = dev_get_drvdata(dev); struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host); - struct st_mmc_platform_data *pdata = pltfm_host->priv; + struct st_mmc_platform_data *pdata = sdhci_pltfm_priv(pltfm_host); int ret = sdhci_suspend_host(host); if (ret) @@ -471,7 +471,7 @@ static int sdhci_st_resume(struct device *dev) { struct sdhci_host *host = dev_get_drvdata(dev); struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host); - struct st_mmc_platform_data *pdata = pltfm_host->priv; + struct st_mmc_platform_data *pdata = sdhci_pltfm_priv(pltfm_host); struct device_node *np = dev->of_node; clk_prepare_enable(pltfm_host->clk); -- cgit v1.1