aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/mmc
diff options
context:
space:
mode:
authorUlf Hansson <ulf.hansson@linaro.org>2013-09-26 03:43:24 -0400
committerChris Ball <cjb@laptop.org>2013-10-30 20:28:31 -0400
commitff71c4bcb0af2730d047989e485303ae4e1ce794 (patch)
treede33234b9fd4b5dfa0d5ebb8b30eadd14811ce7f /drivers/mmc
parent83234ac895b769241771e1c23f889e0615780ffc (diff)
mmc: rtsx: Remove redundant suspend and resume callbacks
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> Signed-off-by: Chris Ball <cjb@laptop.org>
Diffstat (limited to 'drivers/mmc')
-rw-r--r--drivers/mmc/host/rtsx_pci_sdmmc.c33
1 files changed, 0 insertions, 33 deletions
diff --git a/drivers/mmc/host/rtsx_pci_sdmmc.c b/drivers/mmc/host/rtsx_pci_sdmmc.c
index e2ab12473f97..c46feda07d56 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 = {
1197 .execute_tuning = sdmmc_execute_tuning, 1197 .execute_tuning = sdmmc_execute_tuning,
1198}; 1198};
1199 1199
1200#ifdef CONFIG_PM
1201static int rtsx_pci_sdmmc_suspend(struct platform_device *pdev,
1202 pm_message_t state)
1203{
1204 struct realtek_pci_sdmmc *host = platform_get_drvdata(pdev);
1205 struct mmc_host *mmc = host->mmc;
1206 int err;
1207
1208 dev_dbg(sdmmc_dev(host), "--> %s\n", __func__);
1209
1210 err = mmc_suspend_host(mmc);
1211 if (err)
1212 return err;
1213
1214 return 0;
1215}
1216
1217static int rtsx_pci_sdmmc_resume(struct platform_device *pdev)
1218{
1219 struct realtek_pci_sdmmc *host = platform_get_drvdata(pdev);
1220 struct mmc_host *mmc = host->mmc;
1221
1222 dev_dbg(sdmmc_dev(host), "--> %s\n", __func__);
1223
1224 return mmc_resume_host(mmc);
1225}
1226#else /* CONFIG_PM */
1227#define rtsx_pci_sdmmc_suspend NULL
1228#define rtsx_pci_sdmmc_resume NULL
1229#endif /* CONFIG_PM */
1230
1231static void init_extra_caps(struct realtek_pci_sdmmc *host) 1200static void init_extra_caps(struct realtek_pci_sdmmc *host)
1232{ 1201{
1233 struct mmc_host *mmc = host->mmc; 1202 struct mmc_host *mmc = host->mmc;
@@ -1367,8 +1336,6 @@ static struct platform_driver rtsx_pci_sdmmc_driver = {
1367 .probe = rtsx_pci_sdmmc_drv_probe, 1336 .probe = rtsx_pci_sdmmc_drv_probe,
1368 .remove = rtsx_pci_sdmmc_drv_remove, 1337 .remove = rtsx_pci_sdmmc_drv_remove,
1369 .id_table = rtsx_pci_sdmmc_ids, 1338 .id_table = rtsx_pci_sdmmc_ids,
1370 .suspend = rtsx_pci_sdmmc_suspend,
1371 .resume = rtsx_pci_sdmmc_resume,
1372 .driver = { 1339 .driver = {
1373 .owner = THIS_MODULE, 1340 .owner = THIS_MODULE,
1374 .name = DRV_NAME_RTSX_PCI_SDMMC, 1341 .name = DRV_NAME_RTSX_PCI_SDMMC,