mmc: atmel: Use devm_mmc_alloc_host() helper

Use new function devm_mmc_alloc_host() to simplify the code.

Cc: Aubin Constans <aubin.constans@microchip.com>
Cc: Nicolas Ferre <nicolas.ferre@microchip.com>
Cc: Alexandre Belloni <alexandre.belloni@bootlin.com>
Cc: Claudiu Beznea <claudiu.beznea@tuxon.dev>
Reviewed-by: Huacai Chen <chenhuacai@loongson.cn>
Signed-off-by: Binbin Zhou <zhoubinbin@loongson.cn>
Acked-by: Aubin Constans <aubin.constans@microchip.com>
Link: https://lore.kernel.org/r/0688b77b93d27bd2f2e155fca6f53a1766fc3a80.1748933789.git.zhoubinbin@loongson.cn
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>

diff --git a/drivers/mmc/host/atmel-mci.c b/drivers/mmc/host/atmel-mci.c
index 0e0666c0bb6ee835868572be8ef47a5b0579051a..c885c04e938ad17fb7a68f0e010e97887a52b23d 100644 (file)
--- a/drivers/mmc/host/atmel-mci.c
+++ b/drivers/mmc/host/atmel-mci.c
@@ -2248,7 +2248,7 @@ static int atmci_init_slot(struct atmel_mci *host,
        struct atmel_mci_slot           *slot;
        int ret;
 
-       mmc = mmc_alloc_host(sizeof(struct atmel_mci_slot), dev);
+       mmc = devm_mmc_alloc_host(dev, sizeof(*slot));
        if (!mmc)
                return -ENOMEM;
 
@@ -2321,10 +2321,8 @@ static int atmci_init_slot(struct atmel_mci *host,
        host->slot[id] = slot;
        mmc_regulator_get_supply(mmc);
        ret = mmc_add_host(mmc);
-       if (ret) {
-               mmc_free_host(mmc);
+       if (ret)
                return ret;
-       }
 
        if (slot->detect_pin) {
                timer_setup(&slot->detect_timer, atmci_detect_change, 0);
@@ -2362,7 +2360,6 @@ static void atmci_cleanup_slot(struct atmel_mci_slot *slot,
        }
 
        slot->host->slot[id] = NULL;
-       mmc_free_host(slot->mmc);
 }
 
 static int atmci_configure_dma(struct atmel_mci *host)