Skip to content

Commit

Permalink
mmc: mmci: Move away from using deprecated APIs
Browse files Browse the repository at this point in the history
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: Ulf Hansson <ulf.hansson@linaro.org>
Signed-off-by: Chris Ball <cjb@laptop.org>
  • Loading branch information
Ulf Hansson authored and Chris Ball committed Oct 31, 2013
1 parent ccad9b9 commit 578aebc
Showing 1 changed file with 4 additions and 13 deletions.
17 changes: 4 additions & 13 deletions drivers/mmc/host/mmci.c
Original file line number Diff line number Diff line change
Expand Up @@ -1725,37 +1725,28 @@ static int mmci_suspend(struct device *dev)
{
struct amba_device *adev = to_amba_device(dev);
struct mmc_host *mmc = amba_get_drvdata(adev);
int ret = 0;

if (mmc) {
struct mmci_host *host = mmc_priv(mmc);

ret = mmc_suspend_host(mmc);
if (ret == 0) {
pm_runtime_get_sync(dev);
writel(0, host->base + MMCIMASK0);
}
pm_runtime_get_sync(dev);
writel(0, host->base + MMCIMASK0);
}

return ret;
return 0;
}

static int mmci_resume(struct device *dev)
{
struct amba_device *adev = to_amba_device(dev);
struct mmc_host *mmc = amba_get_drvdata(adev);
int ret = 0;

if (mmc) {
struct mmci_host *host = mmc_priv(mmc);

writel(MCI_IRQENABLE, host->base + MMCIMASK0);
pm_runtime_put(dev);

ret = mmc_resume_host(mmc);
}

return ret;
return 0;
}
#endif

Expand Down

0 comments on commit 578aebc

Please sign in to comment.