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

mmc: sdhci-esdhc-mcf: 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.

Acked-by: Angelo Dureghello <adureghello@baylibre.com>
Signed-off-by: Binbin Zhou <zhoubinbin@loongson.cn>
Link: https://lore.kernel.org/r/3843af6a7726d8879e5cba02e0321e08c8908328.1749127796.git.zhoubinbin@loongson.cn
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>

authored by

Binbin Zhou and committed by
Ulf Hansson
eb270f41 06d7faf7

+7 -18
+7 -18
drivers/mmc/host/sdhci-esdhc-mcf.c
··· 426 426 host->flags |= SDHCI_AUTO_CMD12; 427 427 428 428 mcf_data->clk_ipg = devm_clk_get(&pdev->dev, "ipg"); 429 - if (IS_ERR(mcf_data->clk_ipg)) { 430 - err = PTR_ERR(mcf_data->clk_ipg); 431 - goto err_exit; 432 - } 429 + if (IS_ERR(mcf_data->clk_ipg)) 430 + return PTR_ERR(mcf_data->clk_ipg); 433 431 434 432 mcf_data->clk_ahb = devm_clk_get(&pdev->dev, "ahb"); 435 - if (IS_ERR(mcf_data->clk_ahb)) { 436 - err = PTR_ERR(mcf_data->clk_ahb); 437 - goto err_exit; 438 - } 433 + if (IS_ERR(mcf_data->clk_ahb)) 434 + return PTR_ERR(mcf_data->clk_ahb); 439 435 440 436 mcf_data->clk_per = devm_clk_get(&pdev->dev, "per"); 441 - if (IS_ERR(mcf_data->clk_per)) { 442 - err = PTR_ERR(mcf_data->clk_per); 443 - goto err_exit; 444 - } 437 + if (IS_ERR(mcf_data->clk_per)) 438 + return PTR_ERR(mcf_data->clk_per); 445 439 446 440 pltfm_host->clk = mcf_data->clk_per; 447 441 pltfm_host->clock = clk_get_rate(pltfm_host->clk); 448 442 err = clk_prepare_enable(mcf_data->clk_per); 449 443 if (err) 450 - goto err_exit; 444 + return err; 451 445 452 446 err = clk_prepare_enable(mcf_data->clk_ipg); 453 447 if (err) ··· 479 485 clk_disable_unprepare(mcf_data->clk_ipg); 480 486 unprep_per: 481 487 clk_disable_unprepare(mcf_data->clk_per); 482 - err_exit: 483 - sdhci_pltfm_free(pdev); 484 - 485 488 return err; 486 489 } 487 490 ··· 493 502 clk_disable_unprepare(mcf_data->clk_ipg); 494 503 clk_disable_unprepare(mcf_data->clk_ahb); 495 504 clk_disable_unprepare(mcf_data->clk_per); 496 - 497 - sdhci_pltfm_free(pdev); 498 505 } 499 506 500 507 static struct platform_driver sdhci_esdhc_mcf_driver = {