mmc: core: Handle both poweroff notification types for eMMC

Depending on the context of the operation while powering down the card,
either POWER_OFF_NOTIFY_SHORT or POWER_OFF_NOTIFY_LONG will be used. In
suspend context a short timeout is preferred while a long timeout would
be acceptable in a shutdown/hibernation context.

We add a new parameter to the mmc_suspend function so we can provide an
indication of what notification type to use.

Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Signed-off-by: Chris Ball <cjb@laptop.org>

diff --git a/drivers/mmc/core/mmc.c b/drivers/mmc/core/mmc.c
index c8c7135c84b03c2c263b17682730fa0c289cc564..ab34a39486aec788240f16c8d8c42e5c392e4c5a 100644 (file)
--- a/drivers/mmc/core/mmc.c
+++ b/drivers/mmc/core/mmc.c
@@ -1464,12 +1464,11 @@ static void mmc_detect(struct mmc_host *host)
        }
 }
 
-/*
- * Suspend callback from host.
- */
-static int mmc_suspend(struct mmc_host *host)
+static int _mmc_suspend(struct mmc_host *host, bool is_suspend)
 {
        int err = 0;
+       unsigned int notify_type = is_suspend ? EXT_CSD_POWER_OFF_SHORT :
+                                       EXT_CSD_POWER_OFF_LONG;
 
        BUG_ON(!host);
        BUG_ON(!host->card);
@@ -1487,7 +1486,7 @@ static int mmc_suspend(struct mmc_host *host)
                goto out;
 
        if (mmc_can_poweroff_notify(host->card))
-               err = mmc_poweroff_notify(host->card, EXT_CSD_POWER_OFF_SHORT);
+               err = mmc_poweroff_notify(host->card, notify_type);
        else if (mmc_can_sleep(host->card))
                err = mmc_sleep(host);
        else if (!mmc_host_is_spi(host))
@@ -1501,6 +1500,14 @@ out:
        return err;
 }
 
+/*
+ * Suspend callback from host.
+ */
+static int mmc_suspend(struct mmc_host *host)
+{
+       return _mmc_suspend(host, true);
+}
+
 /*
  * Resume callback from host.
  *