aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/mmc/host/mxs-mmc.c
diff options
context:
space:
mode:
authorUlf Hansson <ulf.hansson@linaro.org>2013-09-25 09:21:53 -0400
committerChris Ball <cjb@laptop.org>2013-10-30 20:28:25 -0400
commit683590791dedcae4170cb0fd4b05241098d27b54 (patch)
treeb60ec0ad24d041ad36c6d8e34ae16c4b4dca3372 /drivers/mmc/host/mxs-mmc.c
parent3932afd514af5855741116159627a90fd1ac918e (diff)
mmc: mxs-mmc: Move away from using deprecated APIs
Suspend and resume of cards are being handled from the protocol layer and consequently the mmc_suspend|resume_host APIs are deprecated. This means we can simplify the suspend|resume callbacks by removing the use of the deprecated APIs. Cc: Shawn Guo <shawn.guo@linaro.org> Cc: Fabio Estevam <fabio.estevam@freescale.com> Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org> Acked-by: Shawn Guo <shawn.guo@linaro.org> Signed-off-by: Chris Ball <cjb@laptop.org>
Diffstat (limited to 'drivers/mmc/host/mxs-mmc.c')
-rw-r--r--drivers/mmc/host/mxs-mmc.c12
1 files changed, 2 insertions, 10 deletions
diff --git a/drivers/mmc/host/mxs-mmc.c b/drivers/mmc/host/mxs-mmc.c
index e1fa3ef735e0..50fc9df791b2 100644
--- a/drivers/mmc/host/mxs-mmc.c
+++ b/drivers/mmc/host/mxs-mmc.c
@@ -724,13 +724,9 @@ static int mxs_mmc_suspend(struct device *dev)
724 struct mmc_host *mmc = dev_get_drvdata(dev); 724 struct mmc_host *mmc = dev_get_drvdata(dev);
725 struct mxs_mmc_host *host = mmc_priv(mmc); 725 struct mxs_mmc_host *host = mmc_priv(mmc);
726 struct mxs_ssp *ssp = &host->ssp; 726 struct mxs_ssp *ssp = &host->ssp;
727 int ret = 0;
728
729 ret = mmc_suspend_host(mmc);
730 727
731 clk_disable_unprepare(ssp->clk); 728 clk_disable_unprepare(ssp->clk);
732 729 return 0;
733 return ret;
734} 730}
735 731
736static int mxs_mmc_resume(struct device *dev) 732static int mxs_mmc_resume(struct device *dev)
@@ -738,13 +734,9 @@ static int mxs_mmc_resume(struct device *dev)
738 struct mmc_host *mmc = dev_get_drvdata(dev); 734 struct mmc_host *mmc = dev_get_drvdata(dev);
739 struct mxs_mmc_host *host = mmc_priv(mmc); 735 struct mxs_mmc_host *host = mmc_priv(mmc);
740 struct mxs_ssp *ssp = &host->ssp; 736 struct mxs_ssp *ssp = &host->ssp;
741 int ret = 0;
742 737
743 clk_prepare_enable(ssp->clk); 738 clk_prepare_enable(ssp->clk);
744 739 return 0;
745 ret = mmc_resume_host(mmc);
746
747 return ret;
748} 740}
749 741
750static const struct dev_pm_ops mxs_mmc_pm_ops = { 742static const struct dev_pm_ops mxs_mmc_pm_ops = {