Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Binbin Zhou and committed by
Ulf Hansson
3a55e989 18cd5e59

+3 -6
+3 -6
drivers/mmc/host/sdhci-pic32.c
··· 157 157 ret = plat_data->setup_dma(ADMA_FIFO_RD_THSHLD, 158 158 ADMA_FIFO_WR_THSHLD); 159 159 if (ret) 160 - goto err_host; 160 + goto err; 161 161 } 162 162 163 163 sdhci_pdata->sys_clk = devm_clk_get(&pdev->dev, "sys_clk"); 164 164 if (IS_ERR(sdhci_pdata->sys_clk)) { 165 165 ret = PTR_ERR(sdhci_pdata->sys_clk); 166 166 dev_err(&pdev->dev, "Error getting clock\n"); 167 - goto err_host; 167 + goto err; 168 168 } 169 169 170 170 ret = clk_prepare_enable(sdhci_pdata->sys_clk); 171 171 if (ret) { 172 172 dev_err(&pdev->dev, "Error enabling clock\n"); 173 - goto err_host; 173 + goto err; 174 174 } 175 175 176 176 sdhci_pdata->base_clk = devm_clk_get(&pdev->dev, "base_clk"); ··· 203 203 clk_disable_unprepare(sdhci_pdata->base_clk); 204 204 err_sys_clk: 205 205 clk_disable_unprepare(sdhci_pdata->sys_clk); 206 - err_host: 207 - sdhci_pltfm_free(pdev); 208 206 err: 209 207 dev_err(&pdev->dev, "pic32-sdhci probe failed: %d\n", ret); 210 208 return ret; ··· 218 220 sdhci_remove_host(host, scratch == (u32)~0); 219 221 clk_disable_unprepare(sdhci_pdata->base_clk); 220 222 clk_disable_unprepare(sdhci_pdata->sys_clk); 221 - sdhci_pltfm_free(pdev); 222 223 } 223 224 224 225 static const struct of_device_id pic32_sdhci_id_table[] = {