All of lore.kernel.org
 help / color / mirror / Atom feed
From: Ulf Hansson <ulf.hansson@stericsson.com>
To: linux-mmc@vger.kernel.org, Chris Ball <cjb@laptop.org>
Cc: Ulf Hansson <ulf.hansson@linaro.org>
Subject: [PATCH 04/12] mmc: core: Initiate suspend|resume from mmc bus instead of mmc host
Date: Mon, 10 Jun 2013 17:03:39 +0200	[thread overview]
Message-ID: <1370876627-13439-5-git-send-email-ulf.hansson@stericsson.com> (raw)
In-Reply-To: <1370876627-13439-1-git-send-email-ulf.hansson@stericsson.com>

From: Ulf Hansson <ulf.hansson@linaro.org>

The host should be responsible to suspend|resume the host and not the
card. This patch changes this behaviour, by moving the responsiblity
to the mmc bus instead which already holds the card device.

The exported functions mmc_suspend|resume_host are now to be considered
as depcrecated. Once all host drivers moves away from using them, we
can remove them. As of now, a successful error code is always returned.

Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Tested-by: Jaehoon Chung <jh80.chung@samsung.com>
---
 drivers/mmc/core/bus.c  |   19 ++++++++++++++++---
 drivers/mmc/core/core.c |   26 +++-----------------------
 2 files changed, 19 insertions(+), 26 deletions(-)

diff --git a/drivers/mmc/core/bus.c b/drivers/mmc/core/bus.c
index d9e8c2b..3b7ca8a 100644
--- a/drivers/mmc/core/bus.c
+++ b/drivers/mmc/core/bus.c
@@ -127,10 +127,16 @@ static int mmc_bus_suspend(struct device *dev)
 {
 	struct mmc_driver *drv = to_mmc_driver(dev->driver);
 	struct mmc_card *card = mmc_dev_to_card(dev);
-	int ret = 0;
+	struct mmc_host *host = card->host;
+	int ret;
 
-	if (dev->driver && drv->suspend)
+	if (dev->driver && drv->suspend) {
 		ret = drv->suspend(card);
+		if (ret)
+			return ret;
+	}
+
+	ret = host->bus_ops->suspend(host);
 	return ret;
 }
 
@@ -138,10 +144,17 @@ static int mmc_bus_resume(struct device *dev)
 {
 	struct mmc_driver *drv = to_mmc_driver(dev->driver);
 	struct mmc_card *card = mmc_dev_to_card(dev);
-	int ret = 0;
+	struct mmc_host *host = card->host;
+	int ret;
+
+	ret = host->bus_ops->resume(host);
+	if (ret)
+		pr_warn("%s: error %d during resume (card was removed?)\n",
+			mmc_hostname(host), ret);
 
 	if (dev->driver && drv->resume)
 		ret = drv->resume(card);
+
 	return ret;
 }
 #endif
diff --git a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c
index da3b907..49a5bca 100644
--- a/drivers/mmc/core/core.c
+++ b/drivers/mmc/core/core.c
@@ -2619,16 +2619,8 @@ EXPORT_SYMBOL(mmc_cache_ctrl);
  */
 int mmc_suspend_host(struct mmc_host *host)
 {
-	int err = 0;
-
-	mmc_bus_get(host);
-	if (host->bus_ops && !host->bus_dead) {
-		if (host->bus_ops->suspend)
-			err = host->bus_ops->suspend(host);
-	}
-	mmc_bus_put(host);
-
-	return err;
+	/* This function is deprecated */
+	return 0;
 }
 EXPORT_SYMBOL(mmc_suspend_host);
 
@@ -2638,19 +2630,7 @@ EXPORT_SYMBOL(mmc_suspend_host);
  */
 int mmc_resume_host(struct mmc_host *host)
 {
-	int err;
-
-	mmc_bus_get(host);
-	if (host->bus_ops && !host->bus_dead) {
-		BUG_ON(!host->bus_ops->resume);
-		err = host->bus_ops->resume(host);
-		if (err)
-			pr_warning("%s: error %d during resume "
-					    "(card was removed?)\n",
-					    mmc_hostname(host), err);
-	}
-	mmc_bus_put(host);
-
+	/* This function is deprecated */
 	return 0;
 }
 EXPORT_SYMBOL(mmc_resume_host);
-- 
1.7.10


  parent reply	other threads:[~2013-06-10 15:04 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-06-10 15:03 [PATCH 00/12] mmc: core: mmc_bus to handle suspend|resume|shutdown Ulf Hansson
2013-06-10 15:03 ` [PATCH 01/12] mmc: core: Remove unnecessary check for the remove callback Ulf Hansson
2013-06-10 15:03 ` [PATCH 02/12] mmc: core: Validate suspend prerequisites for SDIO at SUSPEND_PREPARE Ulf Hansson
2013-06-10 15:03 ` [PATCH 03/12] mmc: core: Push common suspend|resume code into each bus_ops Ulf Hansson
2013-06-10 15:03 ` Ulf Hansson [this message]
2013-06-10 15:03 ` [PATCH 05/12] mmc: core: Handle card shutdown from mmc_bus Ulf Hansson
2013-06-10 15:03 ` [PATCH 06/12] mmc: core: Extend shutdown sequence to handle bus operations Ulf Hansson
2013-06-10 15:03 ` [PATCH 07/12] mmc: core: Add shutdown callback for SD bus_ops Ulf Hansson
2013-06-10 15:03 ` [PATCH 08/12] mmc: core: Handle both poweroff notification types for eMMC Ulf Hansson
2013-06-10 15:03 ` [PATCH 09/12] mmc: core: Add shutdown callback for (e)MMC bus_ops Ulf Hansson
2013-06-10 15:03 ` [PATCH 10/12] mmc: core: Enable power_off_notify for eMMC shutdown sequence Ulf Hansson
2013-06-10 15:03 ` [PATCH 11/12] mmc: core: Invent MMC_CAP2_FULL_PWR_CYCLE Ulf Hansson
2013-06-10 15:03 ` [PATCH 12/12] mmc: core: Add DT-bindings for MMC_CAP2_FULL_PWR_CYCLE Ulf Hansson
2013-06-11  9:24 ` [PATCH 00/12] mmc: core: mmc_bus to handle suspend|resume|shutdown Linus Walleij
2013-06-12  8:15   ` Pierre Ossman
2013-06-27 15:43 ` Chris Ball

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1370876627-13439-5-git-send-email-ulf.hansson@stericsson.com \
    --to=ulf.hansson@stericsson.com \
    --cc=cjb@laptop.org \
    --cc=linux-mmc@vger.kernel.org \
    --cc=ulf.hansson@linaro.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.