Commit 578aebc7 authored by Ulf Hansson's avatar Ulf Hansson Committed by Chris Ball

mmc: mmci: 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: Russell King <linux@arm.linux.org.uk>
Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
Signed-off-by: default avatarChris Ball <cjb@laptop.org>
parent ccad9b97
...@@ -1725,37 +1725,28 @@ static int mmci_suspend(struct device *dev) ...@@ -1725,37 +1725,28 @@ static int mmci_suspend(struct device *dev)
{ {
struct amba_device *adev = to_amba_device(dev); struct amba_device *adev = to_amba_device(dev);
struct mmc_host *mmc = amba_get_drvdata(adev); struct mmc_host *mmc = amba_get_drvdata(adev);
int ret = 0;
if (mmc) { if (mmc) {
struct mmci_host *host = mmc_priv(mmc); struct mmci_host *host = mmc_priv(mmc);
pm_runtime_get_sync(dev);
ret = mmc_suspend_host(mmc); writel(0, host->base + MMCIMASK0);
if (ret == 0) {
pm_runtime_get_sync(dev);
writel(0, host->base + MMCIMASK0);
}
} }
return ret; return 0;
} }
static int mmci_resume(struct device *dev) static int mmci_resume(struct device *dev)
{ {
struct amba_device *adev = to_amba_device(dev); struct amba_device *adev = to_amba_device(dev);
struct mmc_host *mmc = amba_get_drvdata(adev); struct mmc_host *mmc = amba_get_drvdata(adev);
int ret = 0;
if (mmc) { if (mmc) {
struct mmci_host *host = mmc_priv(mmc); struct mmci_host *host = mmc_priv(mmc);
writel(MCI_IRQENABLE, host->base + MMCIMASK0); writel(MCI_IRQENABLE, host->base + MMCIMASK0);
pm_runtime_put(dev); pm_runtime_put(dev);
ret = mmc_resume_host(mmc);
} }
return ret; return 0;
} }
#endif #endif
......
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