Linux MultiMedia Card development
 help / color / mirror / Atom feed
From: Binbin Zhou <zhoubinbin@loongson.cn>
To: Binbin Zhou <zhoubb.aaron@gmail.com>,
	Huacai Chen <chenhuacai@loongson.cn>,
	Ulf Hansson <ulf.hansson@linaro.org>,
	Adrian Hunter <adrian.hunter@intel.com>
Cc: Huacai Chen <chenhuacai@kernel.org>,
	linux-mmc@vger.kernel.org, Binbin Zhou <zhoubinbin@loongson.cn>,
	Hu Ziji <huziji@marvell.com>
Subject: [PATCH 32/34] mmc: sdhci-xenon: Drop the use of sdhci_pltfm_free()
Date: Mon, 26 May 2025 14:07:20 +0800	[thread overview]
Message-ID: <67f2389da4a2cc4d2d463b652f118ef4e8caeee4.1747792905.git.zhoubinbin@loongson.cn> (raw)
In-Reply-To: <cover.1747792905.git.zhoubinbin@loongson.cn>

Since the devm_mmc_alloc_host() helper is already in
use, sdhci_pltfm_free() is no longer needed.

Cc: Hu Ziji <huziji@marvell.com>
Signed-off-by: Binbin Zhou <zhoubinbin@loongson.cn>
---
 drivers/mmc/host/sdhci-xenon.c | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/drivers/mmc/host/sdhci-xenon.c b/drivers/mmc/host/sdhci-xenon.c
index 098f0ea45cbe..20efb0225d3a 100644
--- a/drivers/mmc/host/sdhci-xenon.c
+++ b/drivers/mmc/host/sdhci-xenon.c
@@ -533,13 +533,12 @@ static int xenon_probe(struct platform_device *pdev)
 	if (dev->of_node) {
 		pltfm_host->clk = devm_clk_get(&pdev->dev, "core");
 		if (IS_ERR(pltfm_host->clk)) {
-			err = PTR_ERR(pltfm_host->clk);
 			dev_err(&pdev->dev, "Failed to setup input clk: %d\n", err);
-			goto free_pltfm;
+			return PTR_ERR(pltfm_host->clk);
 		}
 		err = clk_prepare_enable(pltfm_host->clk);
 		if (err)
-			goto free_pltfm;
+			return err;
 
 		priv->axi_clk = devm_clk_get(&pdev->dev, "axi");
 		if (IS_ERR(priv->axi_clk)) {
@@ -603,8 +602,6 @@ static int xenon_probe(struct platform_device *pdev)
 	clk_disable_unprepare(priv->axi_clk);
 err_clk:
 	clk_disable_unprepare(pltfm_host->clk);
-free_pltfm:
-	sdhci_pltfm_free(pdev);
 	return err;
 }
 
@@ -623,8 +620,6 @@ static void xenon_remove(struct platform_device *pdev)
 	xenon_sdhc_unprepare(host);
 	clk_disable_unprepare(priv->axi_clk);
 	clk_disable_unprepare(pltfm_host->clk);
-
-	sdhci_pltfm_free(pdev);
 }
 
 #ifdef CONFIG_PM_SLEEP
-- 
2.47.1


  parent reply	other threads:[~2025-05-26  6:07 UTC|newest]

Thread overview: 45+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-05-26  6:05 [PATCH 00/34] mmc: Cleanup sdhci_pltfm_free()/sdhci_free_host() usage Binbin Zhou
2025-05-26  6:05 ` [PATCH 01/34] mmc: sdhci: Use devm_mmc_alloc_host() helper Binbin Zhou
2025-05-26  6:27   ` Adrian Hunter
2025-05-26  6:46     ` Binbin Zhou
2025-05-26  6:05 ` [PATCH 02/34] mmc: sdhci-acpi: Drop the use of sdhci_free_host() Binbin Zhou
2025-05-26  6:05 ` [PATCH 03/34] mmc: sdhci-milbeaut: " Binbin Zhou
2025-05-26  6:05 ` [PATCH 04/34] mmc: sdhci-pci: " Binbin Zhou
2025-05-26  6:05 ` [PATCH 05/34] mmc: sdhci-s3c: " Binbin Zhou
2025-05-26  6:05 ` [PATCH 06/34] mmc: sdhci-spear: " Binbin Zhou
2025-05-26  6:05 ` [PATCH 07/34] mmc: sdhci-pltfm: Drop the use of sdhci_pltfm_free() Binbin Zhou
2025-05-26  6:05 ` [PATCH 08/34] mmc: sdhci-bcm-kona: " Binbin Zhou
2025-05-26  6:05 ` [PATCH 09/34] mmc: sdhci-brcmstb: " Binbin Zhou
2025-05-26  6:06 ` [PATCH 10/34] mmc: sdhci-cadence: " Binbin Zhou
2025-05-26  6:06 ` [PATCH 11/34] mmc: sdhci-dove: " Binbin Zhou
2025-05-26  6:06 ` [PATCH 12/34] mmc: sdhci-esdhc-imx: " Binbin Zhou
2025-05-26  6:06 ` [PATCH 13/34] mmc: sdhci-esdhc-mcf: " Binbin Zhou
2025-05-28  8:00   ` Angelo Dureghello
2025-05-28  8:05   ` Angelo Dureghello
2025-05-26  6:06 ` [PATCH 14/34] mmc: sdhci-iproc: " Binbin Zhou
2025-05-26  6:06 ` [PATCH 15/34] mmc: sdhci-msm: " Binbin Zhou
2025-05-26  6:06 ` [PATCH 16/34] mmc: sdhci-npcm: " Binbin Zhou
2025-05-26  6:06 ` [PATCH 17/34] mmc: sdhci-of-arasan: " Binbin Zhou
2025-05-26  7:34   ` Michal Simek
2025-05-26  7:48     ` Binbin Zhou
2025-05-26  6:06 ` [PATCH 18/34] mmc: sdhci-of-aspeed: " Binbin Zhou
2025-05-28  0:43   ` Andrew Jeffery
2025-05-28  4:42     ` Binbin Zhou
2025-05-29  0:46       ` Andrew Jeffery
2025-05-26  6:06 ` [PATCH 19/34] mmc: sdhci-of-at91: " Binbin Zhou
2025-05-26  6:06 ` [PATCH 20/34] mmc: sdhci-of-dwcmshc: " Binbin Zhou
2025-05-26  6:06 ` [PATCH 21/34] mmc: sdhci-of-esdhc: " Binbin Zhou
2025-05-26  6:06 ` [PATCH 22/34] mmc: sdhci-of-k1: " Binbin Zhou
2025-05-26 10:04   ` Yixun Lan
2025-05-26  6:06 ` [PATCH 23/34] mmc: sdhci-of-ma35d1: " Binbin Zhou
2025-05-26  6:06 ` [PATCH 24/34] mmc: sdhci-of-sparx5: " Binbin Zhou
2025-05-26  6:06 ` [PATCH 25/34] mmc: sdhci-omap: " Binbin Zhou
2025-05-26  6:06 ` [PATCH 26/34] mmc: sdhci-pic32: " Binbin Zhou
2025-05-26  6:07 ` [PATCH 27/34] mmc: sdhci-pxav2: " Binbin Zhou
2025-05-26  6:07 ` [PATCH 28/34] mmc: sdhci-pxav3: " Binbin Zhou
2025-05-26  6:07 ` [PATCH 29/34] mmc: sdhci-sprd: " Binbin Zhou
2025-05-28  3:31   ` Chunyan Zhang
2025-05-26  6:07 ` [PATCH 30/34] mmc: sdhci-st: " Binbin Zhou
2025-05-26  6:07 ` [PATCH 31/34] mmc: sdhci-tegra: " Binbin Zhou
2025-05-26  6:07 ` Binbin Zhou [this message]
2025-05-26  6:07 ` [PATCH 33/34] mmc: sdhci_am654: " Binbin Zhou

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=67f2389da4a2cc4d2d463b652f118ef4e8caeee4.1747792905.git.zhoubinbin@loongson.cn \
    --to=zhoubinbin@loongson.cn \
    --cc=adrian.hunter@intel.com \
    --cc=chenhuacai@kernel.org \
    --cc=chenhuacai@loongson.cn \
    --cc=huziji@marvell.com \
    --cc=linux-mmc@vger.kernel.org \
    --cc=ulf.hansson@linaro.org \
    --cc=zhoubb.aaron@gmail.com \
    /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