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

mmc: tmio: 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>
Cc: Ian Molton <ian@mnementh.co.uk>
Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
Signed-off-by: default avatarChris Ball <cjb@laptop.org>
parent cb3ca1ae
...@@ -1145,12 +1145,9 @@ int tmio_mmc_host_suspend(struct device *dev) ...@@ -1145,12 +1145,9 @@ int tmio_mmc_host_suspend(struct device *dev)
{ {
struct mmc_host *mmc = dev_get_drvdata(dev); struct mmc_host *mmc = dev_get_drvdata(dev);
struct tmio_mmc_host *host = mmc_priv(mmc); struct tmio_mmc_host *host = mmc_priv(mmc);
int ret = mmc_suspend_host(mmc);
if (!ret)
tmio_mmc_disable_mmc_irqs(host, TMIO_MASK_ALL); tmio_mmc_disable_mmc_irqs(host, TMIO_MASK_ALL);
return 0;
return ret;
} }
EXPORT_SYMBOL(tmio_mmc_host_suspend); EXPORT_SYMBOL(tmio_mmc_host_suspend);
...@@ -1163,7 +1160,7 @@ int tmio_mmc_host_resume(struct device *dev) ...@@ -1163,7 +1160,7 @@ int tmio_mmc_host_resume(struct device *dev)
/* The MMC core will perform the complete set up */ /* The MMC core will perform the complete set up */
host->resuming = true; host->resuming = true;
return mmc_resume_host(mmc); return 0;
} }
EXPORT_SYMBOL(tmio_mmc_host_resume); EXPORT_SYMBOL(tmio_mmc_host_resume);
......
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