diff options
author | Ohad Ben-Cohen <ohad@wizery.com> | 2010-10-02 07:54:08 -0400 |
---|---|---|
committer | Chris Ball <cjb@laptop.org> | 2010-10-23 09:11:18 -0400 |
commit | 516d5ccdc61178b9701af1adfa86a306d51fbad2 (patch) | |
tree | 7e38502d54516d8e747e1f6478083af1ee686a7a /drivers/mmc/core | |
parent | d3fe37b1a1d98f060279bfa32fcf5a134851a91a (diff) |
mmc: add runtime PM handlers
Add MMC runtime PM handlers, which call mmc_power_save_host
and mmc_power_restore_host in response to runtime_suspend and
runtime_resume events.
Runtime PM is still disabled by default, so this patch alone
has no immediate effect.
Signed-off-by: Ohad Ben-Cohen <ohad@wizery.com>
Tested-by: Luciano Coelho <luciano.coelho@nokia.com>
Signed-off-by: Chris Ball <cjb@laptop.org>
Diffstat (limited to 'drivers/mmc/core')
-rw-r--r-- | drivers/mmc/core/bus.c | 37 |
1 files changed, 37 insertions, 0 deletions
diff --git a/drivers/mmc/core/bus.c b/drivers/mmc/core/bus.c index da3c01b214ec..af8dc6a2a317 100644 --- a/drivers/mmc/core/bus.c +++ b/drivers/mmc/core/bus.c | |||
@@ -14,6 +14,7 @@ | |||
14 | #include <linux/device.h> | 14 | #include <linux/device.h> |
15 | #include <linux/err.h> | 15 | #include <linux/err.h> |
16 | #include <linux/slab.h> | 16 | #include <linux/slab.h> |
17 | #include <linux/pm_runtime.h> | ||
17 | 18 | ||
18 | #include <linux/mmc/card.h> | 19 | #include <linux/mmc/card.h> |
19 | #include <linux/mmc/host.h> | 20 | #include <linux/mmc/host.h> |
@@ -141,6 +142,41 @@ static int mmc_bus_resume(struct device *dev) | |||
141 | return ret; | 142 | return ret; |
142 | } | 143 | } |
143 | 144 | ||
145 | #ifdef CONFIG_PM_RUNTIME | ||
146 | |||
147 | static int mmc_runtime_suspend(struct device *dev) | ||
148 | { | ||
149 | struct mmc_card *card = mmc_dev_to_card(dev); | ||
150 | |||
151 | return mmc_power_save_host(card->host); | ||
152 | } | ||
153 | |||
154 | static int mmc_runtime_resume(struct device *dev) | ||
155 | { | ||
156 | struct mmc_card *card = mmc_dev_to_card(dev); | ||
157 | |||
158 | return mmc_power_restore_host(card->host); | ||
159 | } | ||
160 | |||
161 | static int mmc_runtime_idle(struct device *dev) | ||
162 | { | ||
163 | return pm_runtime_suspend(dev); | ||
164 | } | ||
165 | |||
166 | static const struct dev_pm_ops mmc_bus_pm_ops = { | ||
167 | .runtime_suspend = mmc_runtime_suspend, | ||
168 | .runtime_resume = mmc_runtime_resume, | ||
169 | .runtime_idle = mmc_runtime_idle, | ||
170 | }; | ||
171 | |||
172 | #define MMC_PM_OPS_PTR (&mmc_bus_pm_ops) | ||
173 | |||
174 | #else /* !CONFIG_PM_RUNTIME */ | ||
175 | |||
176 | #define MMC_PM_OPS_PTR NULL | ||
177 | |||
178 | #endif /* !CONFIG_PM_RUNTIME */ | ||
179 | |||
144 | static struct bus_type mmc_bus_type = { | 180 | static struct bus_type mmc_bus_type = { |
145 | .name = "mmc", | 181 | .name = "mmc", |
146 | .dev_attrs = mmc_dev_attrs, | 182 | .dev_attrs = mmc_dev_attrs, |
@@ -150,6 +186,7 @@ static struct bus_type mmc_bus_type = { | |||
150 | .remove = mmc_bus_remove, | 186 | .remove = mmc_bus_remove, |
151 | .suspend = mmc_bus_suspend, | 187 | .suspend = mmc_bus_suspend, |
152 | .resume = mmc_bus_resume, | 188 | .resume = mmc_bus_resume, |
189 | .pm = MMC_PM_OPS_PTR, | ||
153 | }; | 190 | }; |
154 | 191 | ||
155 | int mmc_register_bus(void) | 192 | int mmc_register_bus(void) |