From: David Fries <[email protected]> pci_has_legacy_pm_support says to not register both legacy PM and runtime PM callbacks, modified ifdefs.
Signed-off-by: David Fries <[email protected]> Cc: [email protected] Cc: Chris Ball <[email protected]> Cc: Adrian Hunter <[email protected]> Cc: Yunpeng Gao <[email protected]> --- drivers/mmc/host/sdhci-pci.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/drivers/mmc/host/sdhci-pci.c b/drivers/mmc/host/sdhci-pci.c index d833d9c..eca6e84 100644 --- a/drivers/mmc/host/sdhci-pci.c +++ b/drivers/mmc/host/sdhci-pci.c @@ -991,7 +991,8 @@ static struct sdhci_ops sdhci_pci_ops = { * * \*****************************************************************************/ -#ifdef CONFIG_PM +/* Register legacy PM or PM runtime, not both. */ +#if defined(CONFIG_PM) && !defined(CONFIG_PM_RUNTIME) static int sdhci_pci_suspend(struct pci_dev *pdev, pm_message_t state) { @@ -1085,12 +1086,12 @@ static int sdhci_pci_resume(struct pci_dev *pdev) return 0; } -#else /* CONFIG_PM */ +#else /* CONFIG_PM && !CONFIG_PM_RUNTIME */ #define sdhci_pci_suspend NULL #define sdhci_pci_resume NULL -#endif /* CONFIG_PM */ +#endif /* CONFIG_PM && !CONFIG_PM_RUNTIME */ #ifdef CONFIG_PM_RUNTIME -- 1.7.7.1 -- To unsubscribe from this list: send the line "unsubscribe linux-mmc" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
