From: Ulf Hansson <ulf.hansson@linaro.org>
To: linux-kernel@vger.kernel.org, linux-mmc@vger.kernel.org,
Chris Ball <cjb@laptop.org>
Cc: Ulf Hansson <ulf.hansson@linaro.org>
Subject: [PATCH 11/27] mmc: sdhci: Move away from using deprecated APIs
Date: Thu, 26 Sep 2013 16:54:36 +0200 [thread overview]
Message-ID: <1380207292-16968-12-git-send-email-ulf.hansson@linaro.org> (raw)
In-Reply-To: <1380207292-16968-1-git-send-email-ulf.hansson@linaro.org>
Suspend and resume of cards are being handled from the protocol layer
and consequently the mmc_suspend|resume_host APIs are deprecated.
This means we can simplify the suspend|resume callbacks by removing the
use of the deprecated APIs.
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
---
drivers/mmc/host/sdhci.c | 20 ++------------------
1 file changed, 2 insertions(+), 18 deletions(-)
diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c
index 7a7fb4f..bdb7598 100644
--- a/drivers/mmc/host/sdhci.c
+++ b/drivers/mmc/host/sdhci.c
@@ -2546,8 +2546,6 @@ EXPORT_SYMBOL_GPL(sdhci_disable_irq_wakeups);
int sdhci_suspend_host(struct sdhci_host *host)
{
- int ret;
-
if (host->ops->platform_suspend)
host->ops->platform_suspend(host);
@@ -2559,19 +2557,6 @@ int sdhci_suspend_host(struct sdhci_host *host)
host->flags &= ~SDHCI_NEEDS_RETUNING;
}
- ret = mmc_suspend_host(host->mmc);
- if (ret) {
- if (host->flags & SDHCI_USING_RETUNING_TIMER) {
- host->flags |= SDHCI_NEEDS_RETUNING;
- mod_timer(&host->tuning_timer, jiffies +
- host->tuning_count * HZ);
- }
-
- sdhci_enable_card_detection(host);
-
- return ret;
- }
-
if (!device_may_wakeup(mmc_dev(host->mmc))) {
sdhci_mask_irqs(host, SDHCI_INT_ALL_MASK);
free_irq(host->irq, host);
@@ -2579,14 +2564,14 @@ int sdhci_suspend_host(struct sdhci_host *host)
sdhci_enable_irq_wakeups(host);
enable_irq_wake(host->irq);
}
- return ret;
+ return 0;
}
EXPORT_SYMBOL_GPL(sdhci_suspend_host);
int sdhci_resume_host(struct sdhci_host *host)
{
- int ret;
+ int ret = 0;
if (host->flags & (SDHCI_USE_SDMA | SDHCI_USE_ADMA)) {
if (host->ops->enable_dma)
@@ -2615,7 +2600,6 @@ int sdhci_resume_host(struct sdhci_host *host)
mmiowb();
}
- ret = mmc_resume_host(host->mmc);
sdhci_enable_card_detection(host);
if (host->ops->platform_resume)
--
1.7.9.5
next prev parent reply other threads:[~2013-09-26 14:54 UTC|newest]
Thread overview: 40+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-09-26 14:54 [PATCH 00/27] mmc: Remove the deprecated APIs mmc_suspend|resume_host Ulf Hansson
2013-09-26 14:54 ` [PATCH 01/27] mmc: atmel-mci: Remove redundant suspend and resume callbacks Ulf Hansson
2013-09-26 14:54 ` [PATCH 02/27] mmc: au1xmmc: Move away from using deprecated APIs Ulf Hansson
2013-09-26 14:54 ` [PATCH 03/27] mmc: bfin_sdh: " Ulf Hansson
2013-10-08 3:05 ` Sonic Zhang
2013-09-26 14:54 ` [PATCH 04/27] mmc: cb710: " Ulf Hansson
2013-09-27 16:08 ` Michał Mirosław
2013-09-26 14:54 ` [PATCH 05/27] mmc: davinci_mmc: " Ulf Hansson
2013-09-26 14:54 ` [PATCH 06/27] mmc: dw_mmc: " Ulf Hansson
2013-10-23 11:17 ` Seungwon Jeon
2013-09-26 14:54 ` [PATCH 07/27] mmc: jz4740: " Ulf Hansson
2013-09-26 14:54 ` [PATCH 08/27] mmc: msm_sdcc: " Ulf Hansson
2013-09-26 20:58 ` David Brown
2013-09-26 14:54 ` [PATCH 09/27] mmc: mvsdio: Remove redundant suspend and resume callbacks Ulf Hansson
2013-09-26 15:40 ` Nicolas Pitre
2013-09-27 8:55 ` Ulf Hansson
2013-09-26 14:54 ` [PATCH 10/27] mmc: vub300: " Ulf Hansson
[not found] ` <1380207292-16968-11-git-send-email-ulf.hansson-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
2013-09-27 16:22 ` Alan Stern
2013-09-30 8:24 ` Ulf Hansson
2013-09-26 14:54 ` Ulf Hansson [this message]
2013-09-26 14:54 ` [PATCH 12/27] mmc: tifm_sd: Move away from using deprecated APIs Ulf Hansson
2013-09-26 14:54 ` [PATCH 13/27] mmc: omap: Remove redundant suspend and resume callbacks Ulf Hansson
2013-09-26 14:54 ` [PATCH 14/27] mmc: omap_hsmmc: Move away from using deprecated APIs Ulf Hansson
2013-10-10 14:06 ` Balaji T K
2013-09-26 14:54 ` [PATCH 15/27] mmc: mxs-mmc: " Ulf Hansson
2013-09-27 1:30 ` Shawn Guo
2013-09-26 14:54 ` [PATCH 16/27] mmc: mxcmmc: " Ulf Hansson
2013-09-27 7:19 ` Sascha Hauer
2013-09-26 14:54 ` [PATCH 17/27] mmc: wmt-sdmmc: " Ulf Hansson
2013-09-26 14:54 ` [PATCH 18/27] mmc: s3cmci: Remove redundant suspend and resume callbacks Ulf Hansson
2013-09-26 14:54 ` [PATCH 19/27] mmc: pxamci: " Ulf Hansson
2013-09-26 14:54 ` [PATCH 20/27] mmc: wbsd: Move away from using deprecated APIs Ulf Hansson
2013-09-26 14:54 ` [PATCH 21/27] mmc: rtsx: Remove redundant suspend and resume callbacks Ulf Hansson
2013-09-26 14:54 ` [PATCH 22/27] mmc: sdricoh_cs: Move away from using deprecated APIs Ulf Hansson
2013-09-29 17:56 ` Sascha Sommer
2013-09-26 14:54 ` [PATCH 23/27] mmc: sh_mmcif: " Ulf Hansson
2013-09-26 14:54 ` [PATCH 24/27] mmc: tmio: " Ulf Hansson
2013-09-26 14:54 ` [PATCH 25/27] mmc: via-sdmmc: " Ulf Hansson
2013-09-26 14:54 ` [PATCH 26/27] mmc: mmci: " Ulf Hansson
2013-09-26 14:54 ` [PATCH 27/27] mmc: core: Remove deprecated mmc_suspend|resume_host APIs Ulf Hansson
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=1380207292-16968-12-git-send-email-ulf.hansson@linaro.org \
--to=ulf.hansson@linaro.org \
--cc=cjb@laptop.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mmc@vger.kernel.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;
as well as URLs for NNTP newsgroup(s).