mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2026-06-02 06:22:33 -04:00
mmc: sdhci-pci: Drop the use of sdhci_free_host()
Since the devm_mmc_alloc_host() helper is already in use, sdhci_free_host() is no longer needed. Signed-off-by: Binbin Zhou <zhoubinbin@loongson.cn> Link: https://lore.kernel.org/r/48c54b92b6c4151db0bfee1a74645225878be1ff.1749127796.git.zhoubinbin@loongson.cn Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
This commit is contained in:
@@ -2162,7 +2162,7 @@ static struct sdhci_pci_slot *sdhci_pci_probe_slot(
|
||||
ret = pcim_iomap_regions(pdev, BIT(bar), mmc_hostname(host->mmc));
|
||||
if (ret) {
|
||||
dev_err(&pdev->dev, "cannot request region\n");
|
||||
goto cleanup;
|
||||
return ERR_PTR(ret);
|
||||
}
|
||||
|
||||
host->ioaddr = pcim_iomap_table(pdev)[bar];
|
||||
@@ -2170,7 +2170,7 @@ static struct sdhci_pci_slot *sdhci_pci_probe_slot(
|
||||
if (chip->fixes && chip->fixes->probe_slot) {
|
||||
ret = chip->fixes->probe_slot(slot);
|
||||
if (ret)
|
||||
goto cleanup;
|
||||
return ERR_PTR(ret);
|
||||
}
|
||||
|
||||
host->mmc->pm_caps = MMC_PM_KEEP_POWER;
|
||||
@@ -2231,9 +2231,6 @@ static struct sdhci_pci_slot *sdhci_pci_probe_slot(
|
||||
if (chip->fixes && chip->fixes->remove_slot)
|
||||
chip->fixes->remove_slot(slot, 0);
|
||||
|
||||
cleanup:
|
||||
sdhci_free_host(host);
|
||||
|
||||
return ERR_PTR(ret);
|
||||
}
|
||||
|
||||
@@ -2254,8 +2251,6 @@ static void sdhci_pci_remove_slot(struct sdhci_pci_slot *slot)
|
||||
|
||||
if (slot->chip->fixes && slot->chip->fixes->remove_slot)
|
||||
slot->chip->fixes->remove_slot(slot, dead);
|
||||
|
||||
sdhci_free_host(slot->host);
|
||||
}
|
||||
|
||||
int sdhci_pci_uhs2_add_host(struct sdhci_pci_slot *slot)
|
||||
|
||||
Reference in New Issue
Block a user