77 lines
2.2 KiB
Diff
77 lines
2.2 KiB
Diff
From 74639c7e934c874de97874850ee04691906dcb75 Mon Sep 17 00:00:00 2001
|
|
From: Binbin Zhou <zhoubinbin@loongson.cn>
|
|
Date: Sat, 7 Jun 2025 15:52:58 +0800
|
|
Subject: mmc: sdhci_am654: Drop the use of sdhci_pltfm_free()
|
|
|
|
Since the devm_mmc_alloc_host() helper is already in use,
|
|
sdhci_pltfm_free() is no longer needed.
|
|
|
|
Signed-off-by: Binbin Zhou <zhoubinbin@loongson.cn>
|
|
Link: https://lore.kernel.org/r/a456963bae14b0c6dade02f388f815f1ffcaa98a.1749127796.git.zhoubinbin@loongson.cn
|
|
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
|
|
---
|
|
drivers/mmc/host/sdhci_am654.c | 20 ++++++--------------
|
|
1 file changed, 6 insertions(+), 14 deletions(-)
|
|
|
|
--- a/drivers/mmc/host/sdhci_am654.c
|
|
+++ b/drivers/mmc/host/sdhci_am654.c
|
|
@@ -945,35 +945,30 @@ static int sdhci_am654_probe(struct plat
|
|
clk_xin = devm_clk_get(dev, "clk_xin");
|
|
if (IS_ERR(clk_xin)) {
|
|
dev_err(dev, "clk_xin clock not found.\n");
|
|
- ret = PTR_ERR(clk_xin);
|
|
- goto err_pltfm_free;
|
|
+ return PTR_ERR(clk_xin);
|
|
}
|
|
|
|
pltfm_host->clk = clk_xin;
|
|
|
|
base = devm_platform_ioremap_resource(pdev, 1);
|
|
if (IS_ERR(base)) {
|
|
- ret = PTR_ERR(base);
|
|
- goto err_pltfm_free;
|
|
+ return PTR_ERR(base);
|
|
}
|
|
|
|
sdhci_am654->base = devm_regmap_init_mmio(dev, base,
|
|
&sdhci_am654_regmap_config);
|
|
if (IS_ERR(sdhci_am654->base)) {
|
|
dev_err(dev, "Failed to initialize regmap\n");
|
|
- ret = PTR_ERR(sdhci_am654->base);
|
|
- goto err_pltfm_free;
|
|
+ return PTR_ERR(sdhci_am654->base);
|
|
}
|
|
|
|
ret = sdhci_am654_get_of_property(pdev, sdhci_am654);
|
|
if (ret)
|
|
- goto err_pltfm_free;
|
|
+ return ret;
|
|
|
|
ret = mmc_of_parse(host->mmc);
|
|
- if (ret) {
|
|
- dev_err_probe(dev, ret, "parsing dt failed\n");
|
|
- goto err_pltfm_free;
|
|
- }
|
|
+ if (ret)
|
|
+ return dev_err_probe(dev, ret, "parsing dt failed\n");
|
|
|
|
host->mmc_host_ops.start_signal_voltage_switch = sdhci_am654_start_signal_voltage_switch;
|
|
host->mmc_host_ops.execute_tuning = sdhci_am654_execute_tuning;
|
|
@@ -1004,8 +999,6 @@ pm_disable:
|
|
pm_runtime_disable(dev);
|
|
pm_put:
|
|
pm_runtime_put_noidle(dev);
|
|
-err_pltfm_free:
|
|
- sdhci_pltfm_free(pdev);
|
|
return ret;
|
|
}
|
|
|
|
@@ -1024,7 +1017,6 @@ static void sdhci_am654_remove(struct pl
|
|
clk_disable_unprepare(pltfm_host->clk);
|
|
pm_runtime_disable(dev);
|
|
pm_runtime_put_noidle(dev);
|
|
- sdhci_pltfm_free(pdev);
|
|
}
|
|
|
|
#ifdef CONFIG_PM
|