Revert "mmc: dw_mmc: Don't allow Runtime PM for SDIO cards"

This reverts commit a6db2c86033b ("mmc: dw_mmc: Don't allow Runtime PM for
SDIO cards")'

As dw_mmc now is capable of preventing runtime PM suspend while SDIO IRQs
are enabled, let's drop the less fine-grained method, which is preventing
runtime PM suspend for all SDIO cards - no matter of whether SDIO IRQs are
being enabled or not.

In this way we don't keep the host runtime PM resumed, unless it's really
needed, thus avoiding to waste power.

Especially when SDIO IRQs is supported via a separate out-of-band IRQ line,
which isn't defined by the SDIO standard, typically the SDIO func driver
doesn't enable SDIO IRQs via sdio_claim_irq(). So, for these cases we can
now allow the dwmmc device to be runtime PM suspended in-between requests.

Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Tested-by: Douglas Anderson <dianders@chromium.org>
Reviewed-by: Douglas Anderson <dianders@chromium.org>

diff --git a/drivers/mmc/host/dw_mmc.c b/drivers/mmc/host/dw_mmc.c
index 454b847062b30c61257ce763d8c43043a7685c53..0e2d6f7de469cb27afc65ba8f710cbeaaa96de91 100644 (file)
--- a/drivers/mmc/host/dw_mmc.c
+++ b/drivers/mmc/host/dw_mmc.c
@@ -1621,16 +1621,10 @@ static void dw_mci_init_card(struct mmc_host *mmc, struct mmc_card *card)
 
                if (card->type == MMC_TYPE_SDIO ||
                    card->type == MMC_TYPE_SD_COMBO) {
-                       if (!test_bit(DW_MMC_CARD_NO_LOW_PWR, &slot->flags)) {
-                               pm_runtime_get_noresume(mmc->parent);
-                               set_bit(DW_MMC_CARD_NO_LOW_PWR, &slot->flags);
-                       }
+                       set_bit(DW_MMC_CARD_NO_LOW_PWR, &slot->flags);
                        clk_en_a = clk_en_a_old & ~clken_low_pwr;
                } else {
-                       if (test_bit(DW_MMC_CARD_NO_LOW_PWR, &slot->flags)) {
-                               pm_runtime_put_noidle(mmc->parent);
-                               clear_bit(DW_MMC_CARD_NO_LOW_PWR, &slot->flags);
-                       }
+                       clear_bit(DW_MMC_CARD_NO_LOW_PWR, &slot->flags);
                        clk_en_a = clk_en_a_old | clken_low_pwr;
                }