]> git.proxmox.com Git - mirror_ubuntu-zesty-kernel.git/commitdiff
mmc: rtsx: Remove redundant suspend and resume callbacks
authorUlf Hansson <ulf.hansson@linaro.org>
Thu, 26 Sep 2013 07:43:24 +0000 (09:43 +0200)
committerChris Ball <cjb@laptop.org>
Thu, 31 Oct 2013 00:28:31 +0000 (20:28 -0400)
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>
drivers/mmc/host/rtsx_pci_sdmmc.c

index e2ab12473f976cbe7d9bac3de7e71d4d229970f2..c46feda07d56883b1b6e50cbb46338d73c82bcca 100644 (file)
@@ -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,