From: Peter Griffin Date: Tue, 12 Aug 2014 16:14:26 +0000 (+0100) Subject: mmc: dw_mmc-pci: Remove superflous #else condition on CONFIG_PM_SLEEP X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=eb4667426ba7b0676e888aa8ffc448fcf607d284;p=sagit-ice-cold%2Fkernel_xiaomi_msm8998.git mmc: dw_mmc-pci: Remove superflous #else condition on CONFIG_PM_SLEEP As the code is using SIMPLE_DEV_PM_OPS helper, this compiles away to nothing if CONFIG_PM_SLEEP is disabled. Thus we don't need to #define the suspend/resume callbacks to NULL. Signed-off-by: Peter Griffin Signed-off-by: Ulf Hansson --- diff --git a/drivers/mmc/host/dw_mmc-pci.c b/drivers/mmc/host/dw_mmc-pci.c index 6ada1b36685b..4c69fbd29811 100644 --- a/drivers/mmc/host/dw_mmc-pci.c +++ b/drivers/mmc/host/dw_mmc-pci.c @@ -95,9 +95,6 @@ static int dw_mci_pci_resume(struct device *dev) return dw_mci_resume(host); } -#else -#define dw_mci_pci_suspend NULL -#define dw_mci_pci_resume NULL #endif /* CONFIG_PM_SLEEP */ static SIMPLE_DEV_PM_OPS(dw_mci_pci_pmops, dw_mci_pci_suspend, dw_mci_pci_resume);