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

mmc: sdhci-pxav2: 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/b4f833b5f4816cfe5b9e502d55aad6a970042aad.1749127796.git.zhoubinbin@loongson.cn
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>

authored by

Binbin Zhou and committed by
Ulf Hansson
072f5e2c 3a55e989

+6 -20
+6 -20
drivers/mmc/host/sdhci-pxav2.c
··· 258 258 struct sdhci_host *host = NULL; 259 259 const struct sdhci_pxa_variant *variant; 260 260 261 - int ret; 262 261 struct clk *clk, *clk_core; 263 262 264 263 host = sdhci_pltfm_init(pdev, NULL, sizeof(*pxav2_host)); ··· 270 271 clk = devm_clk_get_optional_enabled(dev, "io"); 271 272 if (!clk) 272 273 clk = devm_clk_get_enabled(dev, NULL); 273 - if (IS_ERR(clk)) { 274 - ret = PTR_ERR(clk); 275 - dev_err_probe(dev, ret, "failed to get io clock\n"); 276 - goto free; 277 - } 274 + if (IS_ERR(clk)) 275 + return dev_err_probe(dev, PTR_ERR(clk), "failed to get io clock\n"); 278 276 pltfm_host->clk = clk; 279 277 280 278 clk_core = devm_clk_get_optional_enabled(dev, "core"); 281 - if (IS_ERR(clk_core)) { 282 - ret = PTR_ERR(clk_core); 283 - dev_err_probe(dev, ret, "failed to enable core clock\n"); 284 - goto free; 285 - } 279 + if (IS_ERR(clk_core)) 280 + return dev_err_probe(dev, PTR_ERR(clk_core), 281 + "failed to enable core clock\n"); 286 282 287 283 host->quirks = SDHCI_QUIRK_BROKEN_ADMA 288 284 | SDHCI_QUIRK_BROKEN_TIMEOUT_VAL ··· 326 332 pxav2_host->pinctrl = NULL; 327 333 } 328 334 329 - ret = sdhci_add_host(host); 330 - if (ret) 331 - goto free; 332 - 333 - return 0; 334 - 335 - free: 336 - sdhci_pltfm_free(pdev); 337 - return ret; 335 + return sdhci_add_host(host); 338 336 } 339 337 340 338 static struct platform_driver sdhci_pxav2_driver = {