Merge remote-tracking branch 'iommu/next'

[deliverable/linux.git] / drivers / mmc / host / sdhci-acpi.c

diff --git a/drivers/mmc/host/sdhci-acpi.c b/drivers/mmc/host/sdhci-acpi.c
index 008709c5cb09d907065984762fb497164fdec531..81d4dc034793ddb72c8ddb1d29c7d1bbb65f1a13 100644 (file)
--- a/drivers/mmc/host/sdhci-acpi.c
+++ b/drivers/mmc/host/sdhci-acpi.c
@@ -275,7 +275,7 @@ static const struct sdhci_acpi_slot sdhci_acpi_slot_int_emmc = {
        .chip    = &sdhci_acpi_chip_int,
        .caps    = MMC_CAP_8_BIT_DATA | MMC_CAP_NONREMOVABLE |
                   MMC_CAP_HW_RESET | MMC_CAP_1_8V_DDR |
-                  MMC_CAP_WAIT_WHILE_BUSY,
+                  MMC_CAP_CMD_DURING_TFR | MMC_CAP_WAIT_WHILE_BUSY,
        .caps2   = MMC_CAP2_HC_ERASE_SZ,
        .flags   = SDHCI_ACPI_RUNTIME_PM,
        .quirks  = SDHCI_QUIRK_NO_ENDATTR_IN_NOPDESC,
@@ -532,11 +532,6 @@ static int sdhci_acpi_resume(struct device *dev)
        return sdhci_resume_host(c->host);
 }
 
-#else
-
-#define sdhci_acpi_suspend     NULL
-#define sdhci_acpi_resume      NULL
-
 #endif
 
 #ifdef CONFIG_PM
@@ -560,8 +555,7 @@ static int sdhci_acpi_runtime_resume(struct device *dev)
 #endif
 
 static const struct dev_pm_ops sdhci_acpi_pm_ops = {
-       .suspend                = sdhci_acpi_suspend,
-       .resume                 = sdhci_acpi_resume,
+       SET_SYSTEM_SLEEP_PM_OPS(sdhci_acpi_suspend, sdhci_acpi_resume)
        SET_RUNTIME_PM_OPS(sdhci_acpi_runtime_suspend,
                        sdhci_acpi_runtime_resume, NULL)
 };