aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter Griffin <peter.griffin@linaro.org>2014-08-12 12:14:28 -0400
committerUlf Hansson <ulf.hansson@linaro.org>2014-09-09 07:59:06 -0400
commitf3a92b1a3258f8ef9a59bab24b9ea68b60908c44 (patch)
tree82d09e05386c03b7706f2aa5fa1bf2c9faaecb55
parent0529b810944932038fae1691b635d585429e6030 (diff)
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>
-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 c3a1debc9289..310ecbcdfb7f 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)
1269 return 0; 1269 return 0;
1270} 1270}
1271 1271
1272#else
1273
1274#define sdhci_pci_runtime_suspend NULL
1275#define sdhci_pci_runtime_resume NULL
1276#define sdhci_pci_runtime_idle NULL
1277
1278#endif 1272#endif
1279 1273
1280static const struct dev_pm_ops sdhci_pci_pm_ops = { 1274static const struct dev_pm_ops sdhci_pci_pm_ops = {
1281 .suspend = sdhci_pci_suspend, 1275 .suspend = sdhci_pci_suspend,
1282 .resume = sdhci_pci_resume, 1276 .resume = sdhci_pci_resume,
1283 .runtime_suspend = sdhci_pci_runtime_suspend, 1277 SET_RUNTIME_PM_OPS(sdhci_pci_runtime_suspend,
1284 .runtime_resume = sdhci_pci_runtime_resume, 1278 sdhci_pci_runtime_resume, sdhci_pci_runtime_idle)
1285 .runtime_idle = sdhci_pci_runtime_idle,
1286}; 1279};
1287 1280
1288/*****************************************************************************\ 1281/*****************************************************************************\