[PATCH v1 4/7] mmc: meson-mx-sdio: Use devm_mmc_alloc_host() helper

[neil.armstrong at linaro.org]

On 11/9/25 00:12, Martin Blumenstingl wrote:
> From: Binbin Zhou <zhoubinbin at loongson.cn>
> 
> Use new function devm_mmc_alloc_host() to simplify the code.
> 
> Signed-off-by: Binbin Zhou <zhoubinbin at loongson.cn>
> Signed-off-by: Martin Blumenstingl <martin.blumenstingl at googlemail.com>
> ---
>   drivers/mmc/host/meson-mx-sdio.c | 18 +++++++-----------
>   1 file changed, 7 insertions(+), 11 deletions(-)
> 
> diff --git a/drivers/mmc/host/meson-mx-sdio.c b/drivers/mmc/host/meson-mx-sdio.c
> index ce1828d915da..214ce84f1ddd 100644
> --- a/drivers/mmc/host/meson-mx-sdio.c
> +++ b/drivers/mmc/host/meson-mx-sdio.c
> @@ -648,7 +648,7 @@ static int meson_mx_mmc_probe(struct platform_device *pdev)
>   	else if (IS_ERR(slot_pdev))
>   		return PTR_ERR(slot_pdev);
>   
> -	mmc = mmc_alloc_host(sizeof(*host), &slot_pdev->dev);
> +	mmc = devm_mmc_alloc_host(&slot_pdev->dev, sizeof(*host));
>   	if (!mmc) {
>   		ret = -ENOMEM;
>   		goto error_unregister_slot_pdev;
> @@ -667,13 +667,13 @@ static int meson_mx_mmc_probe(struct platform_device *pdev)
>   					     &meson_mx_sdio_regmap_config);
>   	if (IS_ERR(host->regmap)) {
>   		ret = PTR_ERR(host->regmap);
> -		goto error_free_mmc;
> +		goto error_unregister_slot_pdev;
>   	}
>   
>   	irq = platform_get_irq(pdev, 0);
>   	if (irq < 0) {
>   		ret = irq;
> -		goto error_free_mmc;
> +		goto error_unregister_slot_pdev;
>   	}
>   
>   	ret = devm_request_threaded_irq(host->controller_dev, irq,
> @@ -681,24 +681,24 @@ static int meson_mx_mmc_probe(struct platform_device *pdev)
>   					meson_mx_mmc_irq_thread, IRQF_ONESHOT,
>   					NULL, host);
>   	if (ret)
> -		goto error_free_mmc;
> +		goto error_unregister_slot_pdev;
>   
>   	core_clk = devm_clk_get_enabled(host->controller_dev, "core");
>   	if (IS_ERR(core_clk)) {
>   		ret = PTR_ERR(core_clk);
> -		goto error_free_mmc;
> +		goto error_unregister_slot_pdev;
>   	}
>   
>   	host->cfg_div_clk = meson_mx_mmc_register_clk(&pdev->dev, base);
>   	if (IS_ERR(host->cfg_div_clk)) {
>   		ret = PTR_ERR(host->cfg_div_clk);
> -		goto error_free_mmc;
> +		goto error_unregister_slot_pdev;
>   	}
>   
>   	ret = clk_prepare_enable(host->cfg_div_clk);
>   	if (ret) {
>   		dev_err(host->controller_dev, "Failed to enable MMC clock\n");
> -		goto error_free_mmc;
> +		goto error_unregister_slot_pdev;
>   	}
>   
>   	conf = 0;
> @@ -718,8 +718,6 @@ static int meson_mx_mmc_probe(struct platform_device *pdev)
>   
>   error_disable_div_clk:
>   	clk_disable_unprepare(host->cfg_div_clk);
> -error_free_mmc:
> -	mmc_free_host(mmc);
>   error_unregister_slot_pdev:
>   	of_platform_device_destroy(&slot_pdev->dev, NULL);
>   	return ret;
> @@ -737,8 +735,6 @@ static void meson_mx_mmc_remove(struct platform_device *pdev)
>   	of_platform_device_destroy(slot_dev, NULL);
>   
>   	clk_disable_unprepare(host->cfg_div_clk);
> -
> -	mmc_free_host(host->mmc);
>   }
>   
>   static const struct of_device_id meson_mx_mmc_of_match[] = {

Reviewed-by: Neil Armstrong <neil.armstrong at linaro.org>