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>,
Wei WANG <wei_wang@realsil.com.cn>,
Samuel Ortiz <sameo@linux.intel.com>
Subject: [PATCH 21/27] mmc: rtsx: Remove redundant suspend and resume callbacks
Date: Thu, 26 Sep 2013 16:54:46 +0200 [thread overview]
Message-ID: <1380207292-16968-22-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 handled by the protocol layer and
consequently the mmc_suspend|resume_host APIs are marked as deprecated.
While moving away from using the deprecated APIs, there are nothing
left to be done for the suspend and resume callbacks, so remove them.
Cc: Wei WANG <wei_wang@realsil.com.cn>
Cc: Samuel Ortiz <sameo@linux.intel.com>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
---
drivers/mmc/host/rtsx_pci_sdmmc.c | 33 ---------------------------------
1 file changed, 33 deletions(-)
diff --git a/drivers/mmc/host/rtsx_pci_sdmmc.c b/drivers/mmc/host/rtsx_pci_sdmmc.c
index e2ab124..c46feda 100644
--- a/drivers/mmc/host/rtsx_pci_sdmmc.c
+++ b/drivers/mmc/host/rtsx_pci_sdmmc.c
@@ -1197,37 +1197,6 @@ static const struct mmc_host_ops realtek_pci_sdmmc_ops = {
.execute_tuning = sdmmc_execute_tuning,
};
-#ifdef CONFIG_PM
-static int rtsx_pci_sdmmc_suspend(struct platform_device *pdev,
- pm_message_t state)
-{
- struct realtek_pci_sdmmc *host = platform_get_drvdata(pdev);
- struct mmc_host *mmc = host->mmc;
- int err;
-
- dev_dbg(sdmmc_dev(host), "--> %s\n", __func__);
-
- err = mmc_suspend_host(mmc);
- if (err)
- return err;
-
- return 0;
-}
-
-static int rtsx_pci_sdmmc_resume(struct platform_device *pdev)
-{
- struct realtek_pci_sdmmc *host = platform_get_drvdata(pdev);
- struct mmc_host *mmc = host->mmc;
-
- dev_dbg(sdmmc_dev(host), "--> %s\n", __func__);
-
- return mmc_resume_host(mmc);
-}
-#else /* CONFIG_PM */
-#define rtsx_pci_sdmmc_suspend NULL
-#define rtsx_pci_sdmmc_resume NULL
-#endif /* CONFIG_PM */
-
static void init_extra_caps(struct realtek_pci_sdmmc *host)
{
struct mmc_host *mmc = host->mmc;
@@ -1367,8 +1336,6 @@ static struct platform_driver rtsx_pci_sdmmc_driver = {
.probe = rtsx_pci_sdmmc_drv_probe,
.remove = rtsx_pci_sdmmc_drv_remove,
.id_table = rtsx_pci_sdmmc_ids,
- .suspend = rtsx_pci_sdmmc_suspend,
- .resume = rtsx_pci_sdmmc_resume,
.driver = {
.owner = THIS_MODULE,
.name = DRV_NAME_RTSX_PCI_SDMMC,
--
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 ` [PATCH 11/27] mmc: sdhci: Move away from using deprecated APIs Ulf Hansson
2013-09-26 14:54 ` [PATCH 12/27] mmc: tifm_sd: " 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 ` Ulf Hansson [this message]
2013-09-26 14:54 ` [PATCH 22/27] mmc: sdricoh_cs: " 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-22-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 \
--cc=sameo@linux.intel.com \
--cc=wei_wang@realsil.com.cn \
/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).