diff options
author | Ulf Hansson <ulf.hansson@linaro.org> | 2013-09-25 04:55:23 -0400 |
---|---|---|
committer | Chris Ball <cjb@laptop.org> | 2013-10-30 20:26:35 -0400 |
commit | 1e63d48542029799b4399411ec010afc8bd747a4 (patch) | |
tree | 8beee29b8be705eb603d99bad1dedfc0dcdfff14 /drivers/mmc | |
parent | 914af7c2e58f49c3f5940030cfc30c6693069934 (diff) |
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')
-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) | |||
1157 | static int au1xmmc_suspend(struct platform_device *pdev, pm_message_t state) | 1157 | static int au1xmmc_suspend(struct platform_device *pdev, pm_message_t state) |
1158 | { | 1158 | { |
1159 | struct au1xmmc_host *host = platform_get_drvdata(pdev); | 1159 | struct au1xmmc_host *host = platform_get_drvdata(pdev); |
1160 | int ret; | ||
1161 | |||
1162 | ret = mmc_suspend_host(host->mmc); | ||
1163 | if (ret) | ||
1164 | return ret; | ||
1165 | 1160 | ||
1166 | au_writel(0, HOST_CONFIG2(host)); | 1161 | au_writel(0, HOST_CONFIG2(host)); |
1167 | au_writel(0, HOST_CONFIG(host)); | 1162 | au_writel(0, HOST_CONFIG(host)); |
@@ -1178,7 +1173,7 @@ static int au1xmmc_resume(struct platform_device *pdev) | |||
1178 | 1173 | ||
1179 | au1xmmc_reset_controller(host); | 1174 | au1xmmc_reset_controller(host); |
1180 | 1175 | ||
1181 | return mmc_resume_host(host->mmc); | 1176 | return 0; |
1182 | } | 1177 | } |
1183 | #else | 1178 | #else |
1184 | #define au1xmmc_suspend NULL | 1179 | #define au1xmmc_suspend NULL |