mirror of
https://github.com/torvalds/linux.git
synced 2026-01-12 00:42:35 +08:00
mmc: sdhci-pic32: 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/e6f16e97f8b82ffa71b8ad34e32e42ab240734e5.1749127796.git.zhoubinbin@loongson.cn Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
This commit is contained in:
@@ -157,20 +157,20 @@ static int pic32_sdhci_probe(struct platform_device *pdev)
|
||||
ret = plat_data->setup_dma(ADMA_FIFO_RD_THSHLD,
|
||||
ADMA_FIFO_WR_THSHLD);
|
||||
if (ret)
|
||||
goto err_host;
|
||||
goto err;
|
||||
}
|
||||
|
||||
sdhci_pdata->sys_clk = devm_clk_get(&pdev->dev, "sys_clk");
|
||||
if (IS_ERR(sdhci_pdata->sys_clk)) {
|
||||
ret = PTR_ERR(sdhci_pdata->sys_clk);
|
||||
dev_err(&pdev->dev, "Error getting clock\n");
|
||||
goto err_host;
|
||||
goto err;
|
||||
}
|
||||
|
||||
ret = clk_prepare_enable(sdhci_pdata->sys_clk);
|
||||
if (ret) {
|
||||
dev_err(&pdev->dev, "Error enabling clock\n");
|
||||
goto err_host;
|
||||
goto err;
|
||||
}
|
||||
|
||||
sdhci_pdata->base_clk = devm_clk_get(&pdev->dev, "base_clk");
|
||||
@@ -203,8 +203,6 @@ err_base_clk:
|
||||
clk_disable_unprepare(sdhci_pdata->base_clk);
|
||||
err_sys_clk:
|
||||
clk_disable_unprepare(sdhci_pdata->sys_clk);
|
||||
err_host:
|
||||
sdhci_pltfm_free(pdev);
|
||||
err:
|
||||
dev_err(&pdev->dev, "pic32-sdhci probe failed: %d\n", ret);
|
||||
return ret;
|
||||
@@ -220,7 +218,6 @@ static void pic32_sdhci_remove(struct platform_device *pdev)
|
||||
sdhci_remove_host(host, scratch == (u32)~0);
|
||||
clk_disable_unprepare(sdhci_pdata->base_clk);
|
||||
clk_disable_unprepare(sdhci_pdata->sys_clk);
|
||||
sdhci_pltfm_free(pdev);
|
||||
}
|
||||
|
||||
static const struct of_device_id pic32_sdhci_id_table[] = {
|
||||
|
||||
Reference in New Issue
Block a user