diff options
author | Ulf Hansson <ulf.hansson@linaro.org> | 2013-09-25 05:45:32 -0400 |
---|---|---|
committer | Chris Ball <cjb@laptop.org> | 2013-10-30 20:26:36 -0400 |
commit | 15a6af4dc0d667593f3b952e96671f15b0edd9dc (patch) | |
tree | 9cb004f87b3ecf7d8cf091436c79e4005770c9c9 /drivers/mmc | |
parent | 1e63d48542029799b4399411ec010afc8bd747a4 (diff) |
mmc: bfin_sdh: 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: Sonic Zhang <sonic.zhang@analog.com>
Cc: uclinux-dist-devel@blackfin.uclinux.org
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Acked-by: Sonic Zhang <sonic.zhang@analog.com>
Signed-off-by: Chris Ball <cjb@laptop.org>
Diffstat (limited to 'drivers/mmc')
-rw-r--r-- | drivers/mmc/host/bfin_sdh.c | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/drivers/mmc/host/bfin_sdh.c b/drivers/mmc/host/bfin_sdh.c index e62c5bc7fa31..2b7f37e82ca9 100644 --- a/drivers/mmc/host/bfin_sdh.c +++ b/drivers/mmc/host/bfin_sdh.c | |||
@@ -639,21 +639,15 @@ static int sdh_remove(struct platform_device *pdev) | |||
639 | #ifdef CONFIG_PM | 639 | #ifdef CONFIG_PM |
640 | static int sdh_suspend(struct platform_device *dev, pm_message_t state) | 640 | static int sdh_suspend(struct platform_device *dev, pm_message_t state) |
641 | { | 641 | { |
642 | struct mmc_host *mmc = platform_get_drvdata(dev); | ||
643 | struct bfin_sd_host *drv_data = get_sdh_data(dev); | 642 | struct bfin_sd_host *drv_data = get_sdh_data(dev); |
644 | int ret = 0; | ||
645 | |||
646 | if (mmc) | ||
647 | ret = mmc_suspend_host(mmc); | ||
648 | 643 | ||
649 | peripheral_free_list(drv_data->pin_req); | 644 | peripheral_free_list(drv_data->pin_req); |
650 | 645 | ||
651 | return ret; | 646 | return 0; |
652 | } | 647 | } |
653 | 648 | ||
654 | static int sdh_resume(struct platform_device *dev) | 649 | static int sdh_resume(struct platform_device *dev) |
655 | { | 650 | { |
656 | struct mmc_host *mmc = platform_get_drvdata(dev); | ||
657 | struct bfin_sd_host *drv_data = get_sdh_data(dev); | 651 | struct bfin_sd_host *drv_data = get_sdh_data(dev); |
658 | int ret = 0; | 652 | int ret = 0; |
659 | 653 | ||
@@ -664,10 +658,6 @@ static int sdh_resume(struct platform_device *dev) | |||
664 | } | 658 | } |
665 | 659 | ||
666 | sdh_reset(); | 660 | sdh_reset(); |
667 | |||
668 | if (mmc) | ||
669 | ret = mmc_resume_host(mmc); | ||
670 | |||
671 | return ret; | 661 | return ret; |
672 | } | 662 | } |
673 | #else | 663 | #else |