From 2d1ec67f16320171ef935c6dac2e63d1c33553fd Mon Sep 17 00:00:00 2001
From: Ohad Ben-Cohen <ohad@wizery.com>
Date: Sat, 2 Oct 2010 13:54:08 +0200
Subject: [PATCH] --- yaml --- r: 219007 b: refs/heads/master c:
 516d5ccdc61178b9701af1adfa86a306d51fbad2 h: refs/heads/master i:   219005:
 d6c573194f838970c43a513821325d04074917e1   219003:
 b2248694554506c1b8ec3205930352207a1e0dfe   218999:
 105710a6e16ed7cb316294d3d038d9961e75ddd8   218991:
 1ebc48ce07d081302e617d1525d8dc982f23f7b4   218975:
 74a50d725aa093ba68517837fa77de1e2be93a07   218943:
 43c348663c3bd391e96aae3d26329cf0d9ed1c54   218879:
 a10a7152c2558d8238484e8de8ebeffe8e6236c8 v: v3

---
 [refs]                       |  2 +-
 trunk/drivers/mmc/core/bus.c | 37 ++++++++++++++++++++++++++++++++++++
 2 files changed, 38 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 7eafd32acb9c..0df482bb669b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d3fe37b1a1d98f060279bfa32fcf5a134851a91a
+refs/heads/master: 516d5ccdc61178b9701af1adfa86a306d51fbad2
diff --git a/trunk/drivers/mmc/core/bus.c b/trunk/drivers/mmc/core/bus.c
index da3c01b214ec..af8dc6a2a317 100644
--- a/trunk/drivers/mmc/core/bus.c
+++ b/trunk/drivers/mmc/core/bus.c
@@ -14,6 +14,7 @@
 #include <linux/device.h>
 #include <linux/err.h>
 #include <linux/slab.h>
+#include <linux/pm_runtime.h>
 
 #include <linux/mmc/card.h>
 #include <linux/mmc/host.h>
@@ -141,6 +142,41 @@ static int mmc_bus_resume(struct device *dev)
 	return ret;
 }
 
+#ifdef CONFIG_PM_RUNTIME
+
+static int mmc_runtime_suspend(struct device *dev)
+{
+	struct mmc_card *card = mmc_dev_to_card(dev);
+
+	return mmc_power_save_host(card->host);
+}
+
+static int mmc_runtime_resume(struct device *dev)
+{
+	struct mmc_card *card = mmc_dev_to_card(dev);
+
+	return mmc_power_restore_host(card->host);
+}
+
+static int mmc_runtime_idle(struct device *dev)
+{
+	return pm_runtime_suspend(dev);
+}
+
+static const struct dev_pm_ops mmc_bus_pm_ops = {
+	.runtime_suspend	= mmc_runtime_suspend,
+	.runtime_resume		= mmc_runtime_resume,
+	.runtime_idle		= mmc_runtime_idle,
+};
+
+#define MMC_PM_OPS_PTR	(&mmc_bus_pm_ops)
+
+#else /* !CONFIG_PM_RUNTIME */
+
+#define MMC_PM_OPS_PTR	NULL
+
+#endif /* !CONFIG_PM_RUNTIME */
+
 static struct bus_type mmc_bus_type = {
 	.name		= "mmc",
 	.dev_attrs	= mmc_dev_attrs,
@@ -150,6 +186,7 @@ static struct bus_type mmc_bus_type = {
 	.remove		= mmc_bus_remove,
 	.suspend	= mmc_bus_suspend,
 	.resume		= mmc_bus_resume,
+	.pm		= MMC_PM_OPS_PTR,
 };
 
 int mmc_register_bus(void)