diff options
| author | Ulf Hansson <ulf.hansson@linaro.org> | 2013-06-10 17:03:37 +0200 |
|---|---|---|
| committer | Chris Ball <cjb@laptop.org> | 2013-06-27 12:39:15 -0400 |
| commit | 810caddba42a54fe5db4e2664757a9a334ba359c (patch) | |
| tree | 12bd0ddf6a95e42bbc5f0438337b5492710760d6 /drivers/mmc/core/core.c | |
| parent | 58a8a4a1a5da4694a3a069de5e0a8c15995e7b5f (diff) | |
| download | op-kernel-dev-810caddba42a54fe5db4e2664757a9a334ba359c.zip op-kernel-dev-810caddba42a54fe5db4e2664757a9a334ba359c.tar.gz | |
mmc: core: Validate suspend prerequisites for SDIO at SUSPEND_PREPARE
This patch moves the validation for all the suspend prerequisites to be
done at SUSPEND_PREPARE notification. Previously in the SDIO case parts
of the validation was done from mmc_suspend_host.
This patch invents a new pre_suspend bus_ops callback and implements it
for SDIO. Returning an error code from it, will mean at SUSPEND_PREPARE
notification, the card will be removed before proceeding with the
suspend sequence.
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Tested-by: Jaehoon Chung <jh80.chung@samsung.com>
Signed-off-by: Chris Ball <cjb@laptop.org>
Diffstat (limited to 'drivers/mmc/core/core.c')
| -rw-r--r-- | drivers/mmc/core/core.c | 25 |
1 files changed, 8 insertions, 17 deletions
diff --git a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c index d2ee282..7a8a42d 100644 --- a/drivers/mmc/core/core.c +++ b/drivers/mmc/core/core.c @@ -2628,22 +2628,6 @@ int mmc_suspend_host(struct mmc_host *host) if (host->bus_ops && !host->bus_dead) { if (host->bus_ops->suspend) err = host->bus_ops->suspend(host); - - if (err == -ENOSYS || !host->bus_ops->resume) { - /* - * We simply "remove" the card in this case. - * It will be redetected on resume. (Calling - * bus_ops->remove() with a claimed host can - * deadlock.) - */ - host->bus_ops->remove(host); - mmc_claim_host(host); - mmc_detach_bus(host); - mmc_power_off(host); - mmc_release_host(host); - host->pm_flags = 0; - err = 0; - } } mmc_bus_put(host); @@ -2706,6 +2690,7 @@ int mmc_pm_notify(struct notifier_block *notify_block, struct mmc_host *host = container_of( notify_block, struct mmc_host, pm_notify); unsigned long flags; + int err = 0; switch (mode) { case PM_HIBERNATION_PREPARE: @@ -2715,7 +2700,13 @@ int mmc_pm_notify(struct notifier_block *notify_block, spin_unlock_irqrestore(&host->lock, flags); cancel_delayed_work_sync(&host->detect); - if (!host->bus_ops || host->bus_ops->suspend) + if (!host->bus_ops) + break; + + /* Validate prerequisites for suspend */ + if (host->bus_ops->pre_suspend) + err = host->bus_ops->pre_suspend(host); + if (!err && host->bus_ops->suspend) break; /* Calling bus_ops->remove() with a claimed host can deadlock */ |
