From 208b250a50d572c4c766b031b2ca4e49ed0aaa5c Mon Sep 17 00:00:00 2001
From: "Rafael J. Wysocki" <rjw@sisk.pl>
Date: Fri, 29 Apr 2011 00:36:32 +0200
Subject: [PATCH] --- yaml --- r: 245365 b: refs/heads/master c:
 8b313a38ecffc0ff0b4c5115f0a461f73b7dfdb6 h: refs/heads/master i:   245363:
 01187e0e47b8f7add90f7f234a129db126ff14de v: v3

---
 [refs]                        |  2 +-
 trunk/drivers/base/platform.c | 31 +++----------------------------
 2 files changed, 4 insertions(+), 29 deletions(-)

diff --git a/[refs] b/[refs]
index 32991c9a4c50..94f78e52498d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 38ade3a1fa0421c12627c7b48c33e89414fc9b76
+refs/heads/master: 8b313a38ecffc0ff0b4c5115f0a461f73b7dfdb6
diff --git a/trunk/drivers/base/platform.c b/trunk/drivers/base/platform.c
index 313556f28c9e..079c18a5e471 100644
--- a/trunk/drivers/base/platform.c
+++ b/trunk/drivers/base/platform.c
@@ -900,35 +900,10 @@ int platform_pm_restore_noirq(struct device *dev)
 
 #endif /* CONFIG_HIBERNATE_CALLBACKS */
 
-#ifdef CONFIG_PM_RUNTIME
-
-int __weak platform_pm_runtime_suspend(struct device *dev)
-{
-	return pm_generic_runtime_suspend(dev);
-};
-
-int __weak platform_pm_runtime_resume(struct device *dev)
-{
-	return pm_generic_runtime_resume(dev);
-};
-
-int __weak platform_pm_runtime_idle(struct device *dev)
-{
-	return pm_generic_runtime_idle(dev);
-};
-
-#else /* !CONFIG_PM_RUNTIME */
-
-#define platform_pm_runtime_suspend NULL
-#define platform_pm_runtime_resume NULL
-#define platform_pm_runtime_idle NULL
-
-#endif /* !CONFIG_PM_RUNTIME */
-
 static const struct dev_pm_ops platform_dev_pm_ops = {
-	.runtime_suspend = platform_pm_runtime_suspend,
-	.runtime_resume = platform_pm_runtime_resume,
-	.runtime_idle = platform_pm_runtime_idle,
+	.runtime_suspend = pm_generic_runtime_suspend,
+	.runtime_resume = pm_generic_runtime_resume,
+	.runtime_idle = pm_generic_runtime_idle,
 	USE_PLATFORM_PM_SLEEP_OPS
 };