Commit cb3ca1ae authored by Ulf Hansson's avatar Ulf Hansson Committed by Chris Ball

mmc: sh_mmcif: 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: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
Signed-off-by: default avatarChris Ball <cjb@laptop.org>
parent b2822d37
...@@ -1542,19 +1542,15 @@ static int sh_mmcif_remove(struct platform_device *pdev) ...@@ -1542,19 +1542,15 @@ static int sh_mmcif_remove(struct platform_device *pdev)
static int sh_mmcif_suspend(struct device *dev) static int sh_mmcif_suspend(struct device *dev)
{ {
struct sh_mmcif_host *host = dev_get_drvdata(dev); struct sh_mmcif_host *host = dev_get_drvdata(dev);
int ret = mmc_suspend_host(host->mmc);
if (!ret) sh_mmcif_writel(host->addr, MMCIF_CE_INT_MASK, MASK_ALL);
sh_mmcif_writel(host->addr, MMCIF_CE_INT_MASK, MASK_ALL);
return ret; return 0;
} }
static int sh_mmcif_resume(struct device *dev) static int sh_mmcif_resume(struct device *dev)
{ {
struct sh_mmcif_host *host = dev_get_drvdata(dev); return 0;
return mmc_resume_host(host->mmc);
} }
#else #else
#define sh_mmcif_suspend NULL #define sh_mmcif_suspend NULL
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment