lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

mmc: sdhci-pci: simplify error handling

Browse Source 
Signed-off-by: Axel Lin <axel.lin@gmail.com>
Acked-by: Adrian Hunter <adrian.hunter@intel.com>
Signed-off-by: Chris Ball <cjb@laptop.org>
This commit is contained in:
Axel Lin
2011-12-03 15:28:05 +08:00
committed by Chris Ball
parent add710eaa8
commit b678b91f22
1 changed files with 18 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
drivers/mmc/host/sdhci-pci.c
View File

@@ -1012,11 +1012,8 @@ static int sdhci_pci_suspend(struct device *dev)
ret = sdhci_suspend_host(slot->host); ret = sdhci_suspend_host(slot->host);
if (ret) { if (ret)
for (i--; i >= 0; i--) goto err_pci_suspend;
sdhci_resume_host(chip->slots[i]->host);
return ret;
}
slot_pm_flags = slot->host->mmc->pm_flags; slot_pm_flags = slot->host->mmc->pm_flags;
if (slot_pm_flags & MMC_PM_WAKE_SDIO_IRQ) if (slot_pm_flags & MMC_PM_WAKE_SDIO_IRQ)
@@ -1027,11 +1024,8 @@ static int sdhci_pci_suspend(struct device *dev)
if (chip->fixes && chip->fixes->suspend) { if (chip->fixes && chip->fixes->suspend) {
ret = chip->fixes->suspend(chip); ret = chip->fixes->suspend(chip);
if (ret) { if (ret)
for (i = chip->num_slots - 1; i >= 0; i--) goto err_pci_suspend;
sdhci_resume_host(chip->slots[i]->host);
return ret;
}
} }
pci_save_state(pdev); pci_save_state(pdev);
@@ -1048,6 +1042,11 @@ static int sdhci_pci_suspend(struct device *dev)
} }
return 0; return 0;
err_pci_suspend:
while (--i >= 0)
sdhci_resume_host(chip->slots[i]->host);
return ret;
} }
static int sdhci_pci_resume(struct device *dev) static int sdhci_pci_resume(struct device *dev)
@@ -1113,23 +1112,22 @@ static int sdhci_pci_runtime_suspend(struct device *dev)
ret = sdhci_runtime_suspend_host(slot->host); ret = sdhci_runtime_suspend_host(slot->host);
if (ret) { if (ret)
for (i--; i >= 0; i--) goto err_pci_runtime_suspend;
sdhci_runtime_resume_host(chip->slots[i]->host);
return ret;
}
} }
if (chip->fixes && chip->fixes->suspend) { if (chip->fixes && chip->fixes->suspend) {
ret = chip->fixes->suspend(chip); ret = chip->fixes->suspend(chip);
if (ret) { if (ret)
for (i = chip->num_slots - 1; i >= 0; i--) goto err_pci_runtime_suspend;
sdhci_runtime_resume_host(chip->slots[i]->host);
return ret;
}
} }
return 0; return 0;
err_pci_runtime_suspend:
while (--i >= 0)
sdhci_runtime_resume_host(chip->slots[i]->host);
return ret;
} }
static int sdhci_pci_runtime_resume(struct device *dev) static int sdhci_pci_runtime_resume(struct device *dev)