mirror of
https://github.com/torvalds/linux.git
synced 2026-06-03 12:03:54 +02:00
mmc: sdhci-of-at91: 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. Cc: Aubin Constans <aubin.constans@microchip.com> Cc: Eugen Hristev <eugen.hristev@linaro.org> Cc: Nicolas Ferre <nicolas.ferre@microchip.com> Cc: Alexandre Belloni <alexandre.belloni@bootlin.com> Cc: Claudiu Beznea <claudiu.beznea@tuxon.dev> Signed-off-by: Binbin Zhou <zhoubinbin@loongson.cn> Acked-by: Aubin Constans <aubin.constans@microchip.com> Link: https://lore.kernel.org/r/d64ed0f849277760d5b9ce04cfff1cd02ad43d19.1749127796.git.zhoubinbin@loongson.cn Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
This commit is contained in:
parent
aa8eeffc0f
commit
6cb3aeccf6
|
|
@ -333,32 +333,26 @@ static int sdhci_at91_probe(struct platform_device *pdev)
|
|||
|
||||
priv->mainck = devm_clk_get(&pdev->dev, "baseclk");
|
||||
if (IS_ERR(priv->mainck)) {
|
||||
if (soc_data->baseclk_is_generated_internally) {
|
||||
if (soc_data->baseclk_is_generated_internally)
|
||||
priv->mainck = NULL;
|
||||
} else {
|
||||
dev_err(&pdev->dev, "failed to get baseclk\n");
|
||||
ret = PTR_ERR(priv->mainck);
|
||||
goto sdhci_pltfm_free;
|
||||
}
|
||||
else
|
||||
return dev_err_probe(&pdev->dev, PTR_ERR(priv->mainck),
|
||||
"failed to get baseclk\n");
|
||||
}
|
||||
|
||||
priv->hclock = devm_clk_get(&pdev->dev, "hclock");
|
||||
if (IS_ERR(priv->hclock)) {
|
||||
dev_err(&pdev->dev, "failed to get hclock\n");
|
||||
ret = PTR_ERR(priv->hclock);
|
||||
goto sdhci_pltfm_free;
|
||||
}
|
||||
if (IS_ERR(priv->hclock))
|
||||
return dev_err_probe(&pdev->dev, PTR_ERR(priv->hclock),
|
||||
"failed to get hclock\n");
|
||||
|
||||
priv->gck = devm_clk_get(&pdev->dev, "multclk");
|
||||
if (IS_ERR(priv->gck)) {
|
||||
dev_err(&pdev->dev, "failed to get multclk\n");
|
||||
ret = PTR_ERR(priv->gck);
|
||||
goto sdhci_pltfm_free;
|
||||
}
|
||||
if (IS_ERR(priv->gck))
|
||||
return dev_err_probe(&pdev->dev, PTR_ERR(priv->gck),
|
||||
"failed to get multclk\n");
|
||||
|
||||
ret = sdhci_at91_set_clks_presets(&pdev->dev);
|
||||
if (ret)
|
||||
goto sdhci_pltfm_free;
|
||||
return ret;
|
||||
|
||||
priv->restore_needed = false;
|
||||
|
||||
|
|
@ -438,8 +432,6 @@ static int sdhci_at91_probe(struct platform_device *pdev)
|
|||
clk_disable_unprepare(priv->gck);
|
||||
clk_disable_unprepare(priv->mainck);
|
||||
clk_disable_unprepare(priv->hclock);
|
||||
sdhci_pltfm_free:
|
||||
sdhci_pltfm_free(pdev);
|
||||
return ret;
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user