From mboxrd@z Thu Jan 1 00:00:00 1970 From: Adrian Hunter Subject: [PATCH 21/25] mmc: sdhci-pci: Do not use suspend/resume callbacks with runtime pm Date: Mon, 20 Mar 2017 19:50:49 +0200 Message-ID: <1490032253-6030-22-git-send-email-adrian.hunter@intel.com> References: <1490032253-6030-1-git-send-email-adrian.hunter@intel.com> Return-path: Received: from mga04.intel.com ([192.55.52.120]:65242 "EHLO mga04.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756304AbdCTR6e (ORCPT ); Mon, 20 Mar 2017 13:58:34 -0400 In-Reply-To: <1490032253-6030-1-git-send-email-adrian.hunter@intel.com> Sender: linux-mmc-owner@vger.kernel.org List-Id: linux-mmc@vger.kernel.org To: Ulf Hansson Cc: linux-mmc , Al Cooper , Jaedon Shin , Haibo Chen , Dong Aisheng , Shawn Lin , Douglas Anderson , Zach Brown , Ludovic Desroches , Jisheng Zhang , Yangbo Lu , Jaehoon Chung , Weijun Yang , Barry Song , Peter Griffin , Lee Jones , Jon Hunter , Harjani Ritesh 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 --- drivers/mmc/host/sdhci-pci-core.c | 12 ------------ 1 file changed, 12 deletions(-) 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) -- 1.9.1