mmc: sdhci-msm: 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/3476546610d5518cc4e4490c4e26a71933615aa6.1749127796.git.zhoubinbin@loongson.cn Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
This commit is contained in:
@@ -2526,7 +2526,7 @@ static int sdhci_msm_probe(struct platform_device *pdev)
|
||||
|
||||
ret = mmc_of_parse(host->mmc);
|
||||
if (ret)
|
||||
goto pltfm_free;
|
||||
return ret;
|
||||
|
||||
/*
|
||||
* Based on the compatible string, load the required msm host info from
|
||||
@@ -2548,7 +2548,7 @@ static int sdhci_msm_probe(struct platform_device *pdev)
|
||||
|
||||
ret = sdhci_msm_gcc_reset(&pdev->dev, host);
|
||||
if (ret)
|
||||
goto pltfm_free;
|
||||
return ret;
|
||||
|
||||
/* Setup SDCC bus voter clock. */
|
||||
msm_host->bus_clk = devm_clk_get(&pdev->dev, "bus");
|
||||
@@ -2556,10 +2556,10 @@ static int sdhci_msm_probe(struct platform_device *pdev)
|
||||
/* Vote for max. clk rate for max. performance */
|
||||
ret = clk_set_rate(msm_host->bus_clk, INT_MAX);
|
||||
if (ret)
|
||||
goto pltfm_free;
|
||||
return ret;
|
||||
ret = clk_prepare_enable(msm_host->bus_clk);
|
||||
if (ret)
|
||||
goto pltfm_free;
|
||||
return ret;
|
||||
}
|
||||
|
||||
/* Setup main peripheral bus clock */
|
||||
@@ -2765,8 +2765,6 @@ clk_disable:
|
||||
bus_clk_disable:
|
||||
if (!IS_ERR(msm_host->bus_clk))
|
||||
clk_disable_unprepare(msm_host->bus_clk);
|
||||
pltfm_free:
|
||||
sdhci_pltfm_free(pdev);
|
||||
return ret;
|
||||
}
|
||||
|
||||
@@ -2788,7 +2786,6 @@ static void sdhci_msm_remove(struct platform_device *pdev)
|
||||
msm_host->bulk_clks);
|
||||
if (!IS_ERR(msm_host->bus_clk))
|
||||
clk_disable_unprepare(msm_host->bus_clk);
|
||||
sdhci_pltfm_free(pdev);
|
||||
}
|
||||
|
||||
static __maybe_unused int sdhci_msm_runtime_suspend(struct device *dev)
|
||||
|
||||
Reference in New Issue
Block a user