aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/mmc
diff options
context:
space:
mode:
authorUlf Hansson <ulf.hansson@linaro.org>2013-09-25 06:16:19 -0400
committerChris Ball <cjb@laptop.org>2013-10-30 20:26:37 -0400
commitd978a2b631506bd0501ceb185a21d23cd63b8790 (patch)
tree2f76b5ad95c4a810b65ec3721c3c357183dbad85 /drivers/mmc
parent15a6af4dc0d667593f3b952e96671f15b0edd9dc (diff)
mmc: cb710: 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: Michał Mirosław <mirq-linux@rere.qmqm.pl> Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org> Acked-by: Michał Mirosław <mirq-linux@rere.qmqm.pl> Signed-off-by: Chris Ball <cjb@laptop.org>
Diffstat (limited to 'drivers/mmc')
-rw-r--r--drivers/mmc/host/cb710-mmc.c10
1 files changed, 1 insertions, 9 deletions
diff --git a/drivers/mmc/host/cb710-mmc.c b/drivers/mmc/host/cb710-mmc.c
index 9d6e2b844404..1087b4c79cd6 100644
--- a/drivers/mmc/host/cb710-mmc.c
+++ b/drivers/mmc/host/cb710-mmc.c
@@ -667,12 +667,6 @@ static const struct mmc_host_ops cb710_mmc_host = {
667static int cb710_mmc_suspend(struct platform_device *pdev, pm_message_t state) 667static int cb710_mmc_suspend(struct platform_device *pdev, pm_message_t state)
668{ 668{
669 struct cb710_slot *slot = cb710_pdev_to_slot(pdev); 669 struct cb710_slot *slot = cb710_pdev_to_slot(pdev);
670 struct mmc_host *mmc = cb710_slot_to_mmc(slot);
671 int err;
672
673 err = mmc_suspend_host(mmc);
674 if (err)
675 return err;
676 670
677 cb710_mmc_enable_irq(slot, 0, ~0); 671 cb710_mmc_enable_irq(slot, 0, ~0);
678 return 0; 672 return 0;
@@ -681,11 +675,9 @@ static int cb710_mmc_suspend(struct platform_device *pdev, pm_message_t state)
681static int cb710_mmc_resume(struct platform_device *pdev) 675static int cb710_mmc_resume(struct platform_device *pdev)
682{ 676{
683 struct cb710_slot *slot = cb710_pdev_to_slot(pdev); 677 struct cb710_slot *slot = cb710_pdev_to_slot(pdev);
684 struct mmc_host *mmc = cb710_slot_to_mmc(slot);
685 678
686 cb710_mmc_enable_irq(slot, 0, ~0); 679 cb710_mmc_enable_irq(slot, 0, ~0);
687 680 return 0;
688 return mmc_resume_host(mmc);
689} 681}
690 682
691#endif /* CONFIG_PM */ 683#endif /* CONFIG_PM */