mirror of https://gitee.com/openkylin/linux.git
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>
This commit is contained in:
parent
914af7c2e5
commit
1e63d48542
|
@ -1157,11 +1157,6 @@ static int au1xmmc_remove(struct platform_device *pdev)
|
||||||
static int au1xmmc_suspend(struct platform_device *pdev, pm_message_t state)
|
static int au1xmmc_suspend(struct platform_device *pdev, pm_message_t state)
|
||||||
{
|
{
|
||||||
struct au1xmmc_host *host = platform_get_drvdata(pdev);
|
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_CONFIG2(host));
|
||||||
au_writel(0, HOST_CONFIG(host));
|
au_writel(0, HOST_CONFIG(host));
|
||||||
|
@ -1178,7 +1173,7 @@ static int au1xmmc_resume(struct platform_device *pdev)
|
||||||
|
|
||||||
au1xmmc_reset_controller(host);
|
au1xmmc_reset_controller(host);
|
||||||
|
|
||||||
return mmc_resume_host(host->mmc);
|
return 0;
|
||||||
}
|
}
|
||||||
#else
|
#else
|
||||||
#define au1xmmc_suspend NULL
|
#define au1xmmc_suspend NULL
|
||||||
|
|
Loading…
Reference in New Issue