OSDN Git Service

mmc: sdhci-pci: Do not use suspend/resume callbacks with runtime pm
authorAdrian Hunter <adrian.hunter@intel.com>
Mon, 20 Mar 2017 17:50:49 +0000 (19:50 +0200)
committerUlf Hansson <ulf.hansson@linaro.org>
Mon, 24 Apr 2017 19:41:37 +0000 (21:41 +0200)
Do not use suspend/resume callbacks with runtime pm. It doesn't make sense
and isn't being used, so remove.

Signed-off-by: Adrian Hunter <adrian.hunter@intel.com>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Tested-by: Ludovic Desroches <ludovic.desroches@microchip.com>
drivers/mmc/host/sdhci-pci-core.c

index b5fd82e..7e8163a 100644 (file)
@@ -1783,12 +1783,6 @@ static int sdhci_pci_runtime_suspend(struct device *dev)
                        mmc_retune_needed(host->mmc);
        }
 
-       if (chip->fixes && chip->fixes->suspend) {
-               ret = chip->fixes->suspend(chip);
-               if (ret)
-                       goto err_pci_runtime_suspend;
-       }
-
        return 0;
 
 err_pci_runtime_suspend:
@@ -1808,12 +1802,6 @@ static int sdhci_pci_runtime_resume(struct device *dev)
        if (!chip)
                return 0;
 
-       if (chip->fixes && chip->fixes->resume) {
-               ret = chip->fixes->resume(chip);
-               if (ret)
-                       return ret;
-       }
-
        for (i = 0; i < chip->num_slots; i++) {
                slot = chip->slots[i];
                if (!slot)