From: Masahiro Yamada <yamada.masahiro@socionext.com>
To: Wolfram Sang <wsa+renesas@sang-engineering.com>,
linux-mmc@vger.kernel.org
Cc: Simon Horman <simon.horman@netronome.com>,
Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>,
Masahiro Yamada <yamada.masahiro@socionext.com>,
linux-kernel@vger.kernel.org,
Ulf Hansson <ulf.hansson@linaro.org>
Subject: [PATCH 2/6] mmc: tmio: set tmio_mmc_host to driver data
Date: Tue, 7 Nov 2017 17:09:28 +0900 [thread overview]
Message-ID: <1510042172-27220-3-git-send-email-yamada.masahiro@socionext.com> (raw)
In-Reply-To: <1510042172-27220-1-git-send-email-yamada.masahiro@socionext.com>
The remove, suspend, resume hooks need tmio_mmc_host. It is tedious
to get mmc_host from the driver_data and pass it to mmc_priv().
We can directly set tmio_mmc_host to driver data to clean up the code.
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
---
drivers/mmc/host/renesas_sdhi_core.c | 3 +--
drivers/mmc/host/tmio_mmc.c | 12 ++++--------
drivers/mmc/host/tmio_mmc_core.c | 8 +++-----
3 files changed, 8 insertions(+), 15 deletions(-)
diff --git a/drivers/mmc/host/renesas_sdhi_core.c b/drivers/mmc/host/renesas_sdhi_core.c
index 4b7a4e2..23c250e 100644
--- a/drivers/mmc/host/renesas_sdhi_core.c
+++ b/drivers/mmc/host/renesas_sdhi_core.c
@@ -656,8 +656,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 64b7e9f..ccfbc15 100644
--- a/drivers/mmc/host/tmio_mmc.c
+++ b/drivers/mmc/host/tmio_mmc.c
@@ -128,15 +128,11 @@ static int tmio_mmc_probe(struct platform_device *pdev)
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 9c4e619..9b8ef73 100644
--- a/drivers/mmc/host/tmio_mmc_core.c
+++ b/drivers/mmc/host/tmio_mmc_core.c
@@ -1190,7 +1190,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;
@@ -1347,8 +1347,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);
@@ -1368,8 +1367,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);
--
2.7.4
next prev parent reply other threads:[~2017-11-07 8:12 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-11-07 8:09 [PATCH 0/6] mmc: tmio, renesas_shci: cleanups, core code change for new driver Masahiro Yamada
2017-11-07 8:09 ` [PATCH 1/6] mmc: renesas_sdhc: remove eprobe jump label Masahiro Yamada
2017-11-20 20:31 ` Wolfram Sang
2017-11-21 3:03 ` Masahiro Yamada
2017-11-07 8:09 ` Masahiro Yamada [this message]
2017-11-19 19:49 ` [PATCH 2/6] mmc: tmio: set tmio_mmc_host to driver data Wolfram Sang
2017-11-20 8:18 ` Masahiro Yamada
2017-11-20 9:20 ` Wolfram Sang
2017-11-20 9:30 ` Masahiro Yamada
2017-11-20 13:22 ` Wolfram Sang
2017-11-20 15:14 ` Masahiro Yamada
2017-11-20 20:40 ` Wolfram Sang
2017-11-07 8:09 ` [PATCH 3/6] mmc: tmio: use devm_ioremap_resource() instead of devm_ioremap() Masahiro Yamada
2017-11-20 20:42 ` Wolfram Sang
2017-11-07 8:09 ` [PATCH 4/6] mmc: tmio: move mmc_host_ops to struct tmio_mmc_host from static data Masahiro Yamada
2017-11-20 20:45 ` Wolfram Sang
2017-11-20 20:48 ` Wolfram Sang
2017-11-23 4:18 ` Masahiro Yamada
2017-11-07 8:09 ` [PATCH 5/6] mmc: tmio, renesas_sdhi: set mmc_host_ops hooks directly Masahiro Yamada
2017-11-20 20:46 ` Wolfram Sang
2017-11-07 8:09 ` [PATCH 6/6] mmc: tmio: move mmc_of_parse() out of tmio_mmc_host_probe() Masahiro Yamada
2017-11-20 20:47 ` Wolfram Sang
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1510042172-27220-3-git-send-email-yamada.masahiro@socionext.com \
--to=yamada.masahiro@socionext.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mmc@vger.kernel.org \
--cc=simon.horman@netronome.com \
--cc=ulf.hansson@linaro.org \
--cc=wsa+renesas@sang-engineering.com \
--cc=yoshihiro.shimoda.uh@renesas.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.