mmc: pxamci: Remove redundant suspend and resume callbacks (359bfcb4) · Commits · 戴 / test

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. Signed-off-by:

Ulf Hansson <ulf.hansson@linaro.org> Signed-off-by:

Chris Ball <cjb@laptop.org>

drivers/mmc/host/pxamci.c

+0 −32

Original line number	Diff line number	Diff line
		@@ -880,35 +880,6 @@ static int pxamci_remove(struct platform_device *pdev)
		return 0;
		}

		#ifdef CONFIG_PM
		static int pxamci_suspend(struct device *dev)
		{
		struct mmc_host *mmc = dev_get_drvdata(dev);
		int ret = 0;

		if (mmc)
		ret = mmc_suspend_host(mmc);

		return ret;
		}

		static int pxamci_resume(struct device *dev)
		{
		struct mmc_host *mmc = dev_get_drvdata(dev);
		int ret = 0;

		if (mmc)
		ret = mmc_resume_host(mmc);

		return ret;
		}

		static const struct dev_pm_ops pxamci_pm_ops = {
		.suspend = pxamci_suspend,
		.resume = pxamci_resume,
		};
		#endif

		static struct platform_driver pxamci_driver = {
		.probe = pxamci_probe,
		.remove = pxamci_remove,
		@@ -916,9 +887,6 @@ static struct platform_driver pxamci_driver = {
		.name = DRIVER_NAME,
		.owner = THIS_MODULE,
		.of_match_table = of_match_ptr(pxa_mmc_dt_ids),
		#ifdef CONFIG_PM
		.pm = &pxamci_pm_ops,
		#endif
		},
		};

Admin message