Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ff71c4bc authored by Ulf Hansson's avatar Ulf Hansson Committed by Chris Ball
Browse files

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: default avatarUlf Hansson <ulf.hansson@linaro.org>
Signed-off-by: default avatarChris Ball <cjb@laptop.org>
parent 83234ac8

drivers/mmc/host/rtsx_pci_sdmmc.c

+0 −33
Original line number Diff line number Diff line
@@ -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,