aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/mmc/host/pxamci.c
diff options
context:
space:
mode:
authorUlf Hansson <ulf.hansson@linaro.org>2013-09-25 10:17:10 -0400
committerChris Ball <cjb@laptop.org>2013-10-30 20:28:29 -0400
commit359bfcb42321e97b677539803f883c50205105e8 (patch)
treed3da46877df01d817f5a913730dbdf0270aac3ea /drivers/mmc/host/pxamci.c
parentbfc55a8e86be704903b93122444f05872db20973 (diff)
mmc: pxamci: 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. Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org> Signed-off-by: Chris Ball <cjb@laptop.org>
Diffstat (limited to 'drivers/mmc/host/pxamci.c')
-rw-r--r--drivers/mmc/host/pxamci.c32
1 files changed, 0 insertions, 32 deletions
diff --git a/drivers/mmc/host/pxamci.c b/drivers/mmc/host/pxamci.c
index 1956a3df7cf3..32fe11323f39 100644
--- a/drivers/mmc/host/pxamci.c
+++ b/drivers/mmc/host/pxamci.c
@@ -880,35 +880,6 @@ static int pxamci_remove(struct platform_device *pdev)
880 return 0; 880 return 0;
881} 881}
882 882
883#ifdef CONFIG_PM
884static int pxamci_suspend(struct device *dev)
885{
886 struct mmc_host *mmc = dev_get_drvdata(dev);
887 int ret = 0;
888
889 if (mmc)
890 ret = mmc_suspend_host(mmc);
891
892 return ret;
893}
894
895static int pxamci_resume(struct device *dev)
896{
897 struct mmc_host *mmc = dev_get_drvdata(dev);
898 int ret = 0;
899
900 if (mmc)
901 ret = mmc_resume_host(mmc);
902
903 return ret;
904}
905
906static const struct dev_pm_ops pxamci_pm_ops = {
907 .suspend = pxamci_suspend,
908 .resume = pxamci_resume,
909};
910#endif
911
912static struct platform_driver pxamci_driver = { 883static struct platform_driver pxamci_driver = {
913 .probe = pxamci_probe, 884 .probe = pxamci_probe,
914 .remove = pxamci_remove, 885 .remove = pxamci_remove,
@@ -916,9 +887,6 @@ static struct platform_driver pxamci_driver = {
916 .name = DRIVER_NAME, 887 .name = DRIVER_NAME,
917 .owner = THIS_MODULE, 888 .owner = THIS_MODULE,
918 .of_match_table = of_match_ptr(pxa_mmc_dt_ids), 889 .of_match_table = of_match_ptr(pxa_mmc_dt_ids),
919#ifdef CONFIG_PM
920 .pm = &pxamci_pm_ops,
921#endif
922 }, 890 },
923}; 891};
924 892