mmc: tmio: set tmio_mmc_host to driver data

The remove, suspend, resume hooks need to get tmio_mmc_host.  It is
tedious to call mmc_priv() to convert mmc_host to tmio_mmc_host.
We can directly set tmio_mmc_host to driver data.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Acked-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>

diff --git a/drivers/mmc/host/renesas_sdhi_core.c b/drivers/mmc/host/renesas_sdhi_core.c
index 0590ae06cd7bc875fa6793cb97583131d0ce3537..9baf4d1791ea2c70167e980cafea02b94fed99d3 100644 (file)
--- a/drivers/mmc/host/renesas_sdhi_core.c
+++ b/drivers/mmc/host/renesas_sdhi_core.c
@@ -657,8 +657,7 @@ EXPORT_SYMBOL_GPL(renesas_sdhi_probe);
 
 int renesas_sdhi_remove(struct platform_device *pdev)
 {
-       struct mmc_host *mmc = platform_get_drvdata(pdev);
-       struct tmio_mmc_host *host = mmc_priv(mmc);
+       struct tmio_mmc_host *host = platform_get_drvdata(pdev);
 
        tmio_mmc_host_remove(host);
 

diff --git a/drivers/mmc/host/tmio_mmc.c b/drivers/mmc/host/tmio_mmc.c
index 64b7e9f18361d8f84a5e4ea3e304722736f17cbb..ccfbc154ee5be4f234176d0f399f7aaad9c55301 100644 (file)
--- a/drivers/mmc/host/tmio_mmc.c
+++ b/drivers/mmc/host/tmio_mmc.c
@@ -128,15 +128,11 @@ out:
 static int tmio_mmc_remove(struct platform_device *pdev)
 {
        const struct mfd_cell *cell = mfd_get_cell(pdev);
-       struct mmc_host *mmc = platform_get_drvdata(pdev);
+       struct tmio_mmc_host *host = platform_get_drvdata(pdev);
 
-       if (mmc) {
-               struct tmio_mmc_host *host = mmc_priv(mmc);
-
-               tmio_mmc_host_remove(host);
-               if (cell->disable)
-                       cell->disable(pdev);
-       }
+       tmio_mmc_host_remove(host);
+       if (cell->disable)
+               cell->disable(pdev);
 
        return 0;
 }

diff --git a/drivers/mmc/host/tmio_mmc_core.c b/drivers/mmc/host/tmio_mmc_core.c
index d6ca57be16c2fd724b6a891a9b7a061b6a8c6d18..8787a996f6a550c793c44a6bc6ab98109e8bb6d8 100644 (file)
--- a/drivers/mmc/host/tmio_mmc_core.c
+++ b/drivers/mmc/host/tmio_mmc_core.c
@@ -1193,7 +1193,7 @@ int tmio_mmc_host_probe(struct tmio_mmc_host *_host,
                return ret;
 
        _host->pdata = pdata;
-       platform_set_drvdata(pdev, mmc);
+       platform_set_drvdata(pdev, _host);
 
        _host->set_pwr = pdata->set_pwr;
        _host->set_clk_div = pdata->set_clk_div;
@@ -1351,8 +1351,7 @@ EXPORT_SYMBOL_GPL(tmio_mmc_host_remove);
 #ifdef CONFIG_PM
 int tmio_mmc_host_runtime_suspend(struct device *dev)
 {
-       struct mmc_host *mmc = dev_get_drvdata(dev);
-       struct tmio_mmc_host *host = mmc_priv(mmc);
+       struct tmio_mmc_host *host = dev_get_drvdata(dev);
 
        tmio_mmc_disable_mmc_irqs(host, TMIO_MASK_ALL);
 
@@ -1372,8 +1371,7 @@ static bool tmio_mmc_can_retune(struct tmio_mmc_host *host)
 
 int tmio_mmc_host_runtime_resume(struct device *dev)
 {
-       struct mmc_host *mmc = dev_get_drvdata(dev);
-       struct tmio_mmc_host *host = mmc_priv(mmc);
+       struct tmio_mmc_host *host = dev_get_drvdata(dev);
 
        tmio_mmc_reset(host);
        tmio_mmc_clk_enable(host);