From: Shawn Lin <shawn.lin@rock-chips.com>
To: Jaehoon Chung <jh80.chung@samsung.com>,
Ulf Hansson <ulf.hansson@linaro.org>
Cc: linux-mmc@vger.kernel.org, Doug Anderson <dianders@chromium.org>,
linux-rockchip@lists.infradead.org,
Shawn Lin <shawn.lin@rock-chips.com>
Subject: [PATCH v2 9/9] mmc: dw_mmc: remove system PM callback
Date: Wed, 12 Oct 2016 10:56:55 +0800 [thread overview]
Message-ID: <1476241015-5932-1-git-send-email-shawn.lin@rock-chips.com> (raw)
In-Reply-To: <1476240643-5701-1-git-send-email-shawn.lin@rock-chips.com>
Now there are no variant drivers using dw_mci_suspend
and dw_mci_resume, so let's remove it.
Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
---
Changes in v2: None
drivers/mmc/host/dw_mmc.c | 81 ++++++++++++++++-------------------------------
drivers/mmc/host/dw_mmc.h | 2 --
2 files changed, 27 insertions(+), 56 deletions(-)
diff --git a/drivers/mmc/host/dw_mmc.c b/drivers/mmc/host/dw_mmc.c
index 297b6c2..1c9ee36 100644
--- a/drivers/mmc/host/dw_mmc.c
+++ b/drivers/mmc/host/dw_mmc.c
@@ -3267,27 +3267,41 @@ EXPORT_SYMBOL(dw_mci_remove);
#ifdef CONFIG_PM
-/*
- * TODO: we should probably disable the clock to the card in the suspend path.
- */
-int dw_mci_suspend(struct dw_mci *host)
+int dw_mci_runtime_suspend(struct device *dev)
{
+ struct dw_mci *host = dev_get_drvdata(dev);
+
if (host->use_dma && host->dma_ops->exit)
host->dma_ops->exit(host);
+ clk_disable_unprepare(host->ciu_clk);
+
+ if (host->cur_slot &&
+ (mmc_can_gpio_cd(host->cur_slot->mmc) ||
+ !mmc_card_is_removable(host->cur_slot->mmc)))
+ clk_disable_unprepare(host->biu_clk);
+
return 0;
}
-EXPORT_SYMBOL(dw_mci_suspend);
+EXPORT_SYMBOL(dw_mci_runtime_suspend);
-int dw_mci_resume(struct dw_mci *host)
+int dw_mci_runtime_resume(struct device *dev)
{
- int i, ret;
+ int i, ret = 0;
+ struct dw_mci *host = dev_get_drvdata(dev);
- if (!dw_mci_ctrl_reset(host, SDMMC_CTRL_ALL_RESET_FLAGS)) {
- ret = -ENODEV;
- return ret;
+ if (host->cur_slot &&
+ (mmc_can_gpio_cd(host->cur_slot->mmc) ||
+ !mmc_card_is_removable(host->cur_slot->mmc))) {
+ ret = clk_prepare_enable(host->biu_clk);
+ if (ret)
+ return ret;
}
+ ret = clk_prepare_enable(host->ciu_clk);
+ if (ret)
+ return ret;
+
if (host->use_dma && host->dma_ops->init)
host->dma_ops->init(host);
@@ -3295,8 +3309,8 @@ int dw_mci_resume(struct dw_mci *host)
* Restore the initial value at FIFOTH register
* And Invalidate the prev_blksz with zero
*/
- mci_writel(host, FIFOTH, host->fifoth_val);
- host->prev_blksz = 0;
+ mci_writel(host, FIFOTH, host->fifoth_val);
+ host->prev_blksz = 0;
/* Put in max timeout */
mci_writel(host, TMOUT, 0xFFFFFFFF);
@@ -3321,48 +3335,7 @@ int dw_mci_resume(struct dw_mci *host)
/* Now that slots are all setup, we can enable card detect */
dw_mci_enable_cd(host);
- return 0;
-}
-EXPORT_SYMBOL(dw_mci_resume);
-
-int dw_mci_runtime_suspend(struct device *dev)
-{
- int err = 0;
- struct dw_mci *host = dev_get_drvdata(dev);
-
- err = dw_mci_suspend(host);
- if (err)
- return err;
-
- clk_disable_unprepare(host->ciu_clk);
-
- if (host->cur_slot &&
- (mmc_can_gpio_cd(host->cur_slot->mmc) ||
- !mmc_card_is_removable(host->cur_slot->mmc)))
- clk_disable_unprepare(host->biu_clk);
-
- return err;
-}
-EXPORT_SYMBOL(dw_mci_runtime_suspend);
-
-int dw_mci_runtime_resume(struct device *dev)
-{
- int ret = 0;
- struct dw_mci *host = dev_get_drvdata(dev);
-
- if (host->cur_slot &&
- (mmc_can_gpio_cd(host->cur_slot->mmc) ||
- !mmc_card_is_removable(host->cur_slot->mmc))) {
- ret = clk_prepare_enable(host->biu_clk);
- if (ret)
- return ret;
- }
-
- ret = clk_prepare_enable(host->ciu_clk);
- if (ret)
- return ret;
-
- return dw_mci_resume(host);
+ return ret;
}
EXPORT_SYMBOL(dw_mci_runtime_resume);
#endif /* CONFIG_PM */
diff --git a/drivers/mmc/host/dw_mmc.h b/drivers/mmc/host/dw_mmc.h
index d14a391..4a6ae750 100644
--- a/drivers/mmc/host/dw_mmc.h
+++ b/drivers/mmc/host/dw_mmc.h
@@ -235,8 +235,6 @@
extern int dw_mci_probe(struct dw_mci *host);
extern void dw_mci_remove(struct dw_mci *host);
#ifdef CONFIG_PM
-extern int dw_mci_suspend(struct dw_mci *host);
-extern int dw_mci_resume(struct dw_mci *host);
extern int dw_mci_runtime_suspend(struct device *device);
extern int dw_mci_runtime_resume(struct device *device);
#endif
--
2.3.7
next prev parent reply other threads:[~2016-10-12 2:56 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <CGME20161012024453epcas1p1bdc2c6bd18d864b5535bd2b067b491af@epcas1p1.samsung.com>
2016-10-12 2:50 ` [PATCH v2 0/9] Init runtime PM support for dw_mmc Shawn Lin
2016-10-12 2:50 ` [PATCH v2 1/9] mmc: dw_mmc: add runtime PM callback Shawn Lin
2016-10-12 2:50 ` [PATCH v2 2/9] mmc: dw_mmc-rockchip: add runtime PM support Shawn Lin
2016-10-12 2:50 ` [PATCH v2 3/9] mmc: core: expose the capability of gpio card detect Shawn Lin
2016-10-12 2:50 ` [PATCH v2 4/9] mmc: dw_mmc: disable biu clk if possible Shawn Lin
[not found] ` <1476240643-5701-1-git-send-email-shawn.lin-TNX95d0MmH7DzftRWevZcw@public.gmane.org>
2016-10-12 2:54 ` [PATCH v2 5/9] mmc: dw_mmc-k3: deploy runtime PM facilities Shawn Lin
2016-10-12 2:55 ` [PATCH v2 6/9] mmc: dw_mmc-exynos: " Shawn Lin
2016-10-12 2:56 ` [PATCH v2 7/9] mmc: dw_mmc-pci: " Shawn Lin
2016-10-12 2:56 ` [PATCH v2 8/9] mmc: dw_mmc-pltfm: " Shawn Lin
2016-10-12 2:56 ` Shawn Lin [this message]
2016-10-18 0:24 ` [PATCH v2 0/9] Init runtime PM support for dw_mmc Jaehoon Chung
2016-10-18 1:04 ` Shawn Lin
2016-10-18 8:46 ` Ulf Hansson
2016-10-18 10:45 ` Jaehoon Chung
[not found] ` <17f821c0-46d3-76e7-06dd-fbb415de37eb-Sze3O3UU22JBDgjK7y7TUQ@public.gmane.org>
2016-10-18 11:15 ` Ulf Hansson
2016-10-18 11:35 ` Shawn Lin
2016-10-18 13:26 ` Heiko Stübner
2016-10-21 1:56 ` Jaehoon Chung
2016-10-21 2:43 ` Shawn Lin
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=1476241015-5932-1-git-send-email-shawn.lin@rock-chips.com \
--to=shawn.lin@rock-chips.com \
--cc=dianders@chromium.org \
--cc=jh80.chung@samsung.com \
--cc=linux-mmc@vger.kernel.org \
--cc=linux-rockchip@lists.infradead.org \
--cc=ulf.hansson@linaro.org \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox