Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 89211418 authored by Jisheng Zhang's avatar Jisheng Zhang Committed by Ulf Hansson
Browse files

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



Commit 0e748234 ("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-arasan driver to this allocation.

Signed-off-by: default avatarJisheng Zhang <jszhang@marvell.com>
Acked-by: default avatarArnd Bergmann <arnd@arndb.de>
Acked-by: default avatarAdrian Hunter <adrian.hunter@intel.com>
Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
parent 0c7fe32e

drivers/mmc/host/sdhci-of-arasan.c

+12 −16
Original line number Diff line number Diff line
@@ -81,7 +81,7 @@ static int sdhci_arasan_suspend(struct device *dev) 
	struct platform_device *pdev = to_platform_device(dev);

	struct sdhci_host *host = platform_get_drvdata(pdev);

	struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host);

	struct sdhci_arasan_data *sdhci_arasan = pltfm_host->priv;

	struct sdhci_arasan_data *sdhci_arasan = sdhci_pltfm_priv(pltfm_host);

	int ret;



	ret = sdhci_suspend_host(host);
@@ -106,7 +106,7 @@ static int sdhci_arasan_resume(struct device *dev) 
	struct platform_device *pdev = to_platform_device(dev);

	struct sdhci_host *host = platform_get_drvdata(pdev);

	struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host);

	struct sdhci_arasan_data *sdhci_arasan = pltfm_host->priv;

	struct sdhci_arasan_data *sdhci_arasan = sdhci_pltfm_priv(pltfm_host);

	int ret;



	ret = clk_enable(sdhci_arasan->clk_ahb);
@@ -137,10 +137,13 @@ static int sdhci_arasan_probe(struct platform_device *pdev) 
	struct sdhci_pltfm_host *pltfm_host;

	struct sdhci_arasan_data *sdhci_arasan;



	sdhci_arasan = devm_kzalloc(&pdev->dev, sizeof(*sdhci_arasan),

			GFP_KERNEL);

	if (!sdhci_arasan)

		return -ENOMEM;

	host = sdhci_pltfm_init(pdev, &sdhci_arasan_pdata,

				sizeof(*sdhci_arasan));

	if (IS_ERR(host))

		return PTR_ERR(host);



	pltfm_host = sdhci_priv(host);

	sdhci_arasan = sdhci_pltfm_priv(pltfm_host);



	sdhci_arasan->clk_ahb = devm_clk_get(&pdev->dev, "clk_ahb");

	if (IS_ERR(sdhci_arasan->clk_ahb)) {
@@ -166,15 +169,7 @@ static int sdhci_arasan_probe(struct platform_device *pdev) 
		goto clk_dis_ahb;

	}



	host = sdhci_pltfm_init(pdev, &sdhci_arasan_pdata, 0);

	if (IS_ERR(host)) {

		ret = PTR_ERR(host);

		goto clk_disable_all;

	}



	sdhci_get_of_property(pdev);

	pltfm_host = sdhci_priv(host);

	pltfm_host->priv = sdhci_arasan;

	pltfm_host->clk = clk_xin;



	ret = mmc_of_parse(host->mmc);
@@ -204,11 +199,12 @@ static int sdhci_arasan_remove(struct platform_device *pdev) 
	int ret;

	struct sdhci_host *host = platform_get_drvdata(pdev);

	struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host);

	struct sdhci_arasan_data *sdhci_arasan = pltfm_host->priv;

	struct sdhci_arasan_data *sdhci_arasan = sdhci_pltfm_priv(pltfm_host);

	struct clk *clk_ahb = sdhci_arasan->clk_ahb;



	ret = sdhci_pltfm_unregister(pdev);



	clk_disable_unprepare(sdhci_arasan->clk_ahb);

	clk_disable_unprepare(clk_ahb);



	return ret;

}