summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorPeter Griffin <peter.griffin@linaro.org>2014-08-12 17:14:28 +0100
committerUlf Hansson <ulf.hansson@linaro.org>2014-09-09 13:59:06 +0200
commitf3a92b1a3258f8ef9a59bab24b9ea68b60908c44 (patch)
tree82d09e05386c03b7706f2aa5fa1bf2c9faaecb55 /drivers
parent0529b810944932038fae1691b635d585429e6030 (diff)
downloadop-kernel-dev-f3a92b1a3258f8ef9a59bab24b9ea68b60908c44.zip
op-kernel-dev-f3a92b1a3258f8ef9a59bab24b9ea68b60908c44.tar.gz
mmc: sdhci-pci: Use SET_RUNTIME_PM_OPS macro to set runtime pm callbacks
This allows us to get rid of the #else condition, as the macro compiles away to nothing if not enabled. Signed-off-by: Peter Griffin <peter.griffin@linaro.org> Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/mmc/host/sdhci-pci.c11
1 files changed, 2 insertions, 9 deletions
diff --git a/drivers/mmc/host/sdhci-pci.c b/drivers/mmc/host/sdhci-pci.c
index c3a1deb..310ecbc 100644
--- a/drivers/mmc/host/sdhci-pci.c
+++ b/drivers/mmc/host/sdhci-pci.c
@@ -1269,20 +1269,13 @@ static int sdhci_pci_runtime_idle(struct device *dev)
return 0;
}
-#else
-
-#define sdhci_pci_runtime_suspend NULL
-#define sdhci_pci_runtime_resume NULL
-#define sdhci_pci_runtime_idle NULL
-
#endif
static const struct dev_pm_ops sdhci_pci_pm_ops = {
.suspend = sdhci_pci_suspend,
.resume = sdhci_pci_resume,
- .runtime_suspend = sdhci_pci_runtime_suspend,
- .runtime_resume = sdhci_pci_runtime_resume,
- .runtime_idle = sdhci_pci_runtime_idle,
+ SET_RUNTIME_PM_OPS(sdhci_pci_runtime_suspend,
+ sdhci_pci_runtime_resume, sdhci_pci_runtime_idle)
};
/*****************************************************************************\
OpenPOWER on IntegriCloud