From: Peter Griffin Date: Tue, 12 Aug 2014 16:14:27 +0000 (+0100) Subject: mmc: dw_mmc-pltfm: Remove superflous #else condition on CONFIG_PM_SLEEP X-Git-Tag: firefly_0821_release~176^2~3089^2~97 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=0529b810944932038fae1691b635d585429e6030;p=firefly-linux-kernel-4.4.55.git mmc: dw_mmc-pltfm: 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-pltfm.c b/drivers/mmc/host/dw_mmc-pltfm.c index b547f7ab18bd..1cd02828e5a3 100644 --- a/drivers/mmc/host/dw_mmc-pltfm.c +++ b/drivers/mmc/host/dw_mmc-pltfm.c @@ -134,9 +134,6 @@ static int dw_mci_pltfm_resume(struct device *dev) return dw_mci_resume(host); } -#else -#define dw_mci_pltfm_suspend NULL -#define dw_mci_pltfm_resume NULL #endif /* CONFIG_PM_SLEEP */ SIMPLE_DEV_PM_OPS(dw_mci_pltfm_pmops, dw_mci_pltfm_suspend, dw_mci_pltfm_resume);