From: neil.armstrong@linaro.org
To: Martin Blumenstingl <martin.blumenstingl@googlemail.com>,
linux-amlogic@lists.infradead.org, linux-mmc@vger.kernel.org
Cc: linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org, ulf.hansson@linaro.org,
Binbin Zhou <zhoubinbin@loongson.cn>
Subject: Re: [PATCH v1 4/7] mmc: meson-mx-sdio: Use devm_mmc_alloc_host() helper
Date: Mon, 17 Nov 2025 10:10:35 +0100 [thread overview]
Message-ID: <3243f07f-da15-4819-837d-4de081d336ac@linaro.org> (raw)
In-Reply-To: <20251108231253.1641927-5-martin.blumenstingl@googlemail.com>
On 11/9/25 00:12, Martin Blumenstingl wrote:
> From: Binbin Zhou <zhoubinbin@loongson.cn>
>
> Use new function devm_mmc_alloc_host() to simplify the code.
>
> Signed-off-by: Binbin Zhou <zhoubinbin@loongson.cn>
> Signed-off-by: Martin Blumenstingl <martin.blumenstingl@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@linaro.org>
next prev parent reply other threads:[~2025-11-17 9:10 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-11-08 23:12 [PATCH v1 0/7] mmc: meson-mx-sdio: Various driver improvements Martin Blumenstingl
2025-11-08 23:12 ` [PATCH v1 1/7] mmc: meson-mx-sdio: Switch to regmap for register access Martin Blumenstingl
2025-11-17 9:08 ` neil.armstrong
2025-11-08 23:12 ` [PATCH v1 2/7] mmc: meson-mx-sdio: Use devm_clk_get_enabled() Martin Blumenstingl
2025-11-17 9:09 ` neil.armstrong
2025-11-08 23:12 ` [PATCH v1 3/7] mmc: meson-mx-sdio: Refactor internal clock initialization Martin Blumenstingl
2025-11-17 9:10 ` neil.armstrong
2025-11-08 23:12 ` [PATCH v1 4/7] mmc: meson-mx-sdio: Use devm_mmc_alloc_host() helper Martin Blumenstingl
2025-11-17 9:10 ` neil.armstrong [this message]
2025-11-08 23:12 ` [PATCH v1 5/7] mmc: meson-mx-sdio: Use dev_err_probe() where appropriate Martin Blumenstingl
2025-11-17 9:11 ` neil.armstrong
2025-11-08 23:12 ` [PATCH v1 6/7] mmc: meson-mx-sdio: Fix indentation in meson_mx_mmc_irq_thread() Martin Blumenstingl
2025-11-17 9:11 ` neil.armstrong
2025-11-08 23:12 ` [PATCH v1 7/7] mmc: meson-mx-sdio: Ignore disabled "mmc-slot" child-nodes Martin Blumenstingl
2025-11-18 15:31 ` [PATCH v1 0/7] mmc: meson-mx-sdio: Various driver improvements Ulf Hansson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=3243f07f-da15-4819-837d-4de081d336ac@linaro.org \
--to=neil.armstrong@linaro.org \
--cc=linux-amlogic@lists.infradead.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mmc@vger.kernel.org \
--cc=martin.blumenstingl@googlemail.com \
--cc=ulf.hansson@linaro.org \
--cc=zhoubinbin@loongson.cn \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox