diff options
| author | Ulf Hansson <ulf.hansson@linaro.org> | 2013-09-25 10:55:23 +0200 |
|---|---|---|
| committer | Chris Ball <cjb@laptop.org> | 2013-10-31 01:26:35 +0100 |
| commit | 1e63d48542029799b4399411ec010afc8bd747a4 (patch) | |
| tree | 8beee29b8be705eb603d99bad1dedfc0dcdfff14 /drivers/mmc/host/au1xmmc.c | |
| parent | mmc: atmel-mci: Remove redundant suspend and resume callbacks (diff) | |
| download | linux-1e63d48542029799b4399411ec010afc8bd747a4.tar.xz linux-1e63d48542029799b4399411ec010afc8bd747a4.zip | |
mmc: au1xmmc: 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: Manuel Lauss <manuel.lauss@googlemail.com>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Signed-off-by: Chris Ball <cjb@laptop.org>
Diffstat (limited to 'drivers/mmc/host/au1xmmc.c')
| -rw-r--r-- | drivers/mmc/host/au1xmmc.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/drivers/mmc/host/au1xmmc.c b/drivers/mmc/host/au1xmmc.c index df9becdd2e99..f5443a6c4915 100644 --- a/drivers/mmc/host/au1xmmc.c +++ b/drivers/mmc/host/au1xmmc.c @@ -1157,11 +1157,6 @@ static int au1xmmc_remove(struct platform_device *pdev) static int au1xmmc_suspend(struct platform_device *pdev, pm_message_t state) { struct au1xmmc_host *host = platform_get_drvdata(pdev); - int ret; - - ret = mmc_suspend_host(host->mmc); - if (ret) - return ret; au_writel(0, HOST_CONFIG2(host)); au_writel(0, HOST_CONFIG(host)); @@ -1178,7 +1173,7 @@ static int au1xmmc_resume(struct platform_device *pdev) au1xmmc_reset_controller(host); - return mmc_resume_host(host->mmc); + return 0; } #else #define au1xmmc_suspend NULL |