mmc: mmc_card_keep_power cleanups

mmc_card_is_powered_resumed is a mouthful; instead, simply use
mmc_card_keep_power, which also better explains the purpose of
the macro.

Employ mmc_card_keep_power() where possible.

Signed-off-by: Ohad Ben-Cohen <ohad@wizery.com>
Signed-off-by: Chris Ball <cjb@laptop.org>

2 files changed, 7 insertions, 7 deletions

diff --git a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c
index 1f453acc8682..c2350e474159 100644
--- a/drivers/mmc/core/core.c
+++ b/drivers/mmc/core/core.c
@@ -1746,7 +1746,7 @@ int mmc_suspend_host(struct mmc_host *host)
         }
         mmc_bus_put(host);
 
-        if (!err && !(host->pm_flags & MMC_PM_KEEP_POWER))
+        if (!err && !mmc_card_keep_power(host))
                 mmc_power_off(host);
 
         return err;
@@ -1764,7 +1764,7 @@ int mmc_resume_host(struct mmc_host *host)
 
         mmc_bus_get(host);
         if (host->bus_ops && !host->bus_dead) {
-                if (!(host->pm_flags & MMC_PM_KEEP_POWER)) {
+                if (!mmc_card_keep_power(host)) {
                         mmc_power_up(host);
                         mmc_select_voltage(host, host->ocr);
                         /*
diff --git a/drivers/mmc/core/sdio.c b/drivers/mmc/core/sdio.c
index db0f0b44d684..0f7d4362d213 100644
--- a/drivers/mmc/core/sdio.c
+++ b/drivers/mmc/core/sdio.c
@@ -625,7 +625,7 @@ static int mmc_sdio_suspend(struct mmc_host *host)
                 }
         }
 
-        if (!err && host->pm_flags & MMC_PM_KEEP_POWER) {
+        if (!err && mmc_card_keep_power(host)) {
                 mmc_claim_host(host);
                 sdio_disable_wide(host->card);
                 mmc_release_host(host);
@@ -645,10 +645,10 @@ static int mmc_sdio_resume(struct mmc_host *host)
         mmc_claim_host(host);
 
         /* No need to reinitialize powered-resumed nonremovable cards */
-        if (mmc_card_is_removable(host) || !mmc_card_is_powered_resumed(host))
+        if (mmc_card_is_removable(host) || !mmc_card_keep_power(host))
                 err = mmc_sdio_init_card(host, host->ocr, host->card,
-                                 (host->pm_flags & MMC_PM_KEEP_POWER));
-        else if (mmc_card_is_powered_resumed(host)) {
+                                        mmc_card_keep_power(host));
+        else if (mmc_card_keep_power(host)) {
                 /* We may have switched to 1-bit mode during suspend */
                 err = sdio_enable_4bit_bus(host->card);
                 if (err > 0) {
@@ -691,7 +691,7 @@ static int mmc_sdio_power_restore(struct mmc_host *host)
 
         mmc_claim_host(host);
         ret = mmc_sdio_init_card(host, host->ocr, host->card,
-                        (host->pm_flags & MMC_PM_KEEP_POWER));
+                                mmc_card_keep_power(host));
         if (!ret && host->sdio_irqs)
                 mmc_signal_sdio_irq(host);
         mmc_release_host(host);