aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/mmc/core
diff options
context:
space:
mode:
authorUlf Hansson <ulf.hansson@linaro.org>2013-06-10 11:03:41 -0400
committerChris Ball <cjb@laptop.org>2013-06-27 12:39:18 -0400
commit6b086bde71243e2596f9d8e3c060119b84110d33 (patch)
treea8ad7455f7d1fbc88efab37baa73bf7a0847a9b5 /drivers/mmc/core
parent7628774851751e55362ec7d9d57c9334e656a655 (diff)
mmc: core: Extend shutdown sequence to handle bus operations
By adding an optional .shutdown callback to the bus_ops struct we provide the possibility to let each bus type handle it's shutdown requirements. Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org> Signed-off-by: Chris Ball <cjb@laptop.org>
Diffstat (limited to 'drivers/mmc/core')
-rw-r--r--drivers/mmc/core/bus.c9
-rw-r--r--drivers/mmc/core/core.h1
2 files changed, 10 insertions, 0 deletions
diff --git a/drivers/mmc/core/bus.c b/drivers/mmc/core/bus.c
index 219bf4b1d97e..4c0decfffb53 100644
--- a/drivers/mmc/core/bus.c
+++ b/drivers/mmc/core/bus.c
@@ -126,8 +126,17 @@ static void mmc_bus_shutdown(struct device *dev)
126{ 126{
127 struct mmc_driver *drv = to_mmc_driver(dev->driver); 127 struct mmc_driver *drv = to_mmc_driver(dev->driver);
128 struct mmc_card *card = mmc_dev_to_card(dev); 128 struct mmc_card *card = mmc_dev_to_card(dev);
129 struct mmc_host *host = card->host;
130 int ret;
129 131
130 drv->shutdown(card); 132 drv->shutdown(card);
133
134 if (host->bus_ops->shutdown) {
135 ret = host->bus_ops->shutdown(host);
136 if (ret)
137 pr_warn("%s: error %d during shutdown\n",
138 mmc_hostname(host), ret);
139 }
131} 140}
132 141
133#ifdef CONFIG_PM_SLEEP 142#ifdef CONFIG_PM_SLEEP
diff --git a/drivers/mmc/core/core.h b/drivers/mmc/core/core.h
index 79f37cfc373b..5345d156493e 100644
--- a/drivers/mmc/core/core.h
+++ b/drivers/mmc/core/core.h
@@ -26,6 +26,7 @@ struct mmc_bus_ops {
26 int (*power_save)(struct mmc_host *); 26 int (*power_save)(struct mmc_host *);
27 int (*power_restore)(struct mmc_host *); 27 int (*power_restore)(struct mmc_host *);
28 int (*alive)(struct mmc_host *); 28 int (*alive)(struct mmc_host *);
29 int (*shutdown)(struct mmc_host *);
29}; 30};
30 31
31void mmc_attach_bus(struct mmc_host *host, const struct mmc_bus_ops *ops); 32void mmc_attach_bus(struct mmc_host *host, const struct mmc_bus_ops *ops);