public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Liming Sun <limings@nvidia.com>
To: Adrian Hunter <adrian.hunter@intel.com>,
	Ulf Hansson <ulf.hansson@linaro.org>,
	David Thompson <davthompson@nvidia.com>,
	Shawn Lin <shawn.lin@rock-chips.com>
Cc: Liming Sun <limings@nvidia.com>, <linux-mmc@vger.kernel.org>,
	<linux-kernel@vger.kernel.org>
Subject: [PATCH v10 1/2] mmc : sdhci-of-dwcmshc : add error handling in dwcmshc_resume
Date: Tue, 22 Aug 2023 15:59:28 -0400	[thread overview]
Message-ID: <20230822195929.168552-1-limings@nvidia.com> (raw)
In-Reply-To: <79137159a833c164ea8ea3f05d8d6d9537db2f42.1683747334.git.limings@nvidia.com>

This commit adds handling in dwcmshc_resume() for different error
cases.

Signed-off-by: Liming Sun <limings@nvidia.com>
---
 drivers/mmc/host/sdhci-of-dwcmshc.c | 21 ++++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)

diff --git a/drivers/mmc/host/sdhci-of-dwcmshc.c b/drivers/mmc/host/sdhci-of-dwcmshc.c
index 31c1892f4ecd..bc332a035032 100644
--- a/drivers/mmc/host/sdhci-of-dwcmshc.c
+++ b/drivers/mmc/host/sdhci-of-dwcmshc.c
@@ -630,17 +630,32 @@ static int dwcmshc_resume(struct device *dev)
 	if (!IS_ERR(priv->bus_clk)) {
 		ret = clk_prepare_enable(priv->bus_clk);
 		if (ret)
-			return ret;
+			goto disable_clk;
 	}
 
 	if (rk_priv) {
 		ret = clk_bulk_prepare_enable(RK35xx_MAX_CLKS,
 					      rk_priv->rockchip_clks);
 		if (ret)
-			return ret;
+			goto disable_bus_clk;
 	}
 
-	return sdhci_resume_host(host);
+	ret = sdhci_resume_host(host);
+	if (ret)
+		goto disable_rockchip_clks;
+
+	return 0;
+
+disable_rockchip_clks:
+	if (rk_priv)
+		clk_bulk_disable_unprepare(RK35xx_MAX_CLKS,
+					   rk_priv->rockchip_clks);
+disable_bus_clk:
+	if (!IS_ERR(priv->bus_clk))
+		clk_disable_unprepare(priv->bus_clk);
+disable_clk:
+	clk_disable_unprepare(pltfm_host->clk);
+	return ret;
 }
 #endif
 
-- 
2.30.1


  parent reply	other threads:[~2023-08-22 19:59 UTC|newest]

Thread overview: 42+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-05-11 19:03 [PATCH v1 1/1] mmc: sdhci-of-dwcmshc: Add runtime PM operations for BlueField-3 Liming Sun
2023-05-12  7:35 ` Ulf Hansson
2023-05-12 12:09   ` Liming Sun
2023-05-12 12:20 ` [PATCH v2] " Liming Sun
2023-05-12 12:26 ` [PATCH v3] mmc: sdhci-of-dwcmshc: Add runtime PM operations Liming Sun
2023-05-12 17:43   ` kernel test robot
2023-05-12 18:15 ` [PATCH v4] " Liming Sun
2023-05-19 13:19   ` Adrian Hunter
2023-07-28 12:20     ` Liming Sun
2023-07-28 12:20 ` [PATCH v5] " Liming Sun
2023-08-01 15:36   ` Adrian Hunter
2023-08-04 23:29     ` Liming Sun
2023-08-04 23:30 ` [PATCH v6] " Liming Sun
2023-08-08  9:39   ` Ulf Hansson
2023-08-08 13:21     ` Liming Sun
2023-08-08 13:56       ` Ulf Hansson
2023-08-08 20:24         ` Liming Sun
2023-08-09 10:58   ` Ulf Hansson
2023-08-08 20:23 ` [PATCH v7] " Liming Sun
2023-08-10  8:12   ` Adrian Hunter
2023-08-10 10:21     ` Ulf Hansson
2023-08-10 12:44       ` Adrian Hunter
2023-08-10 16:34         ` Ulf Hansson
2023-08-11  5:56           ` Adrian Hunter
2023-08-11  8:36             ` Ulf Hansson
2023-08-16 16:28               ` Liming Sun
2023-08-16 21:40                 ` Ulf Hansson
2023-08-17  1:06 ` [PATCH v8] " Liming Sun
2023-08-17  7:35   ` Adrian Hunter
2023-08-17 16:22     ` Liming Sun
2023-08-18  7:27       ` Adrian Hunter
2023-08-17 16:21 ` [PATCH v9] " Liming Sun
2023-08-18  9:00   ` Ulf Hansson
2023-08-18  9:35     ` Adrian Hunter
2023-08-18 10:19       ` Ulf Hansson
2023-08-22 19:46         ` Liming Sun
2023-08-22 19:59 ` Liming Sun [this message]
2023-08-24  7:25   ` [PATCH v10 1/2] mmc : sdhci-of-dwcmshc : add error handling in dwcmshc_resume Adrian Hunter
2023-08-24 11:00   ` Ulf Hansson
2023-08-22 19:59 ` [PATCH v10 2/2] This commit implements the runtime PM operations to disable eMMC card clock when idle Liming Sun
2023-08-24  7:28   ` Adrian Hunter
2023-08-24 11:00   ` Ulf Hansson

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=20230822195929.168552-1-limings@nvidia.com \
    --to=limings@nvidia.com \
    --cc=adrian.hunter@intel.com \
    --cc=davthompson@nvidia.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-mmc@vger.kernel.org \
    --cc=shawn.lin@rock-chips.com \
    --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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox