From: Adrian Hunter Date: Mon, 20 Mar 2017 17:50:49 +0000 (+0200) Subject: mmc: sdhci-pci: Do not use suspend/resume callbacks with runtime pm X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=1cb0a58ec70402bab49bdb4c5d152e82fd82200e;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git mmc: sdhci-pci: Do not use suspend/resume callbacks with runtime pm 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 Signed-off-by: Ulf Hansson Tested-by: Ludovic Desroches --- diff --git a/drivers/mmc/host/sdhci-pci-core.c b/drivers/mmc/host/sdhci-pci-core.c index b5fd82e26125..7e8163affb26 100644 --- a/drivers/mmc/host/sdhci-pci-core.c +++ b/drivers/mmc/host/sdhci-pci-core.c @@ -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)