From: Adrian Hunter <adrian.hunter@intel.com>
To: Axel Lin <axel.lin@gmail.com>
Cc: linux-kernel@vger.kernel.org, Chris Ball <cjb@laptop.org>,
Takashi Iwai <tiwai@suse.de>,
linux-mmc@vger.kernel.org
Subject: Re: [PATCH] mmc: sdhci-pci: simplify error handling
Date: Mon, 05 Dec 2011 13:28:59 +0200 [thread overview]
Message-ID: <4EDCAAFB.4060209@intel.com> (raw)
In-Reply-To: <1322897285.3884.1.camel@phoenix>
On 03/12/11 09:28, Axel Lin wrote:
> Signed-off-by: Axel Lin <axel.lin@gmail.com>
Acked-by: Adrian Hunter <adrian.hunter@intel.com>
> ---
> drivers/mmc/host/sdhci-pci.c | 38 ++++++++++++++++++--------------------
> 1 files changed, 18 insertions(+), 20 deletions(-)
>
> diff --git a/drivers/mmc/host/sdhci-pci.c b/drivers/mmc/host/sdhci-pci.c
> index 6878a94..d2e77fb 100644
> --- a/drivers/mmc/host/sdhci-pci.c
> +++ b/drivers/mmc/host/sdhci-pci.c
> @@ -1012,11 +1012,8 @@ static int sdhci_pci_suspend(struct device *dev)
>
> ret = sdhci_suspend_host(slot->host);
>
> - if (ret) {
> - for (i--; i >= 0; i--)
> - sdhci_resume_host(chip->slots[i]->host);
> - return ret;
> - }
> + if (ret)
> + goto err_pci_suspend;
>
> slot_pm_flags = slot->host->mmc->pm_flags;
> 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) {
> ret = chip->fixes->suspend(chip);
> - if (ret) {
> - for (i = chip->num_slots - 1; i >= 0; i--)
> - sdhci_resume_host(chip->slots[i]->host);
> - return ret;
> - }
> + if (ret)
> + goto err_pci_suspend;
> }
>
> pci_save_state(pdev);
> @@ -1048,6 +1042,11 @@ static int sdhci_pci_suspend(struct device *dev)
> }
>
> 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)
> @@ -1113,23 +1112,22 @@ static int sdhci_pci_runtime_suspend(struct device *dev)
>
> ret = sdhci_runtime_suspend_host(slot->host);
>
> - if (ret) {
> - for (i--; i >= 0; i--)
> - sdhci_runtime_resume_host(chip->slots[i]->host);
> - return ret;
> - }
> + if (ret)
> + goto err_pci_runtime_suspend;
> }
>
> if (chip->fixes && chip->fixes->suspend) {
> ret = chip->fixes->suspend(chip);
> - if (ret) {
> - for (i = chip->num_slots - 1; i >= 0; i--)
> - sdhci_runtime_resume_host(chip->slots[i]->host);
> - return ret;
> - }
> + if (ret)
> + goto err_pci_runtime_suspend;
> }
>
> 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)
next prev parent reply other threads:[~2011-12-05 11:29 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-12-03 7:28 [PATCH] mmc: sdhci-pci: simplify error handling Axel Lin
2011-12-05 11:28 ` Adrian Hunter [this message]
2011-12-08 3:53 ` Chris Ball
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4EDCAAFB.4060209@intel.com \
--to=adrian.hunter@intel.com \
--cc=axel.lin@gmail.com \
--cc=cjb@laptop.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mmc@vger.kernel.org \
--cc=tiwai@suse.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).