Hello Nicolas,
On Thu, Jun 30, 2011 at 03:49:41PM +0200, Nicolas Ferre wrote:
> Take care of slots while going to suspend state.
>
> Signed-off-by: Nicolas Ferre <nicolas.ferre@xxxxxxxxx>
> Signed-off-by: Uwe Kleine-König <u.kleine-koenig@xxxxxxxxxxxxxx>
> ---
> V2: move to pm_ops
>
> drivers/mmc/host/atmel-mci.c | 47 ++++++++++++++++++++++++++++++++++++++++++
> 1 files changed, 47 insertions(+), 0 deletions(-)
>
> diff --git a/drivers/mmc/host/atmel-mci.c b/drivers/mmc/host/atmel-mci.c
> index aa8039f..058f1842 100644
> --- a/drivers/mmc/host/atmel-mci.c
> +++ b/drivers/mmc/host/atmel-mci.c
> @@ -1878,10 +1878,57 @@ static int __exit atmci_remove(struct platform_device *pdev)
> return 0;
> }
>
> +#ifdef CONFIG_PM
> +static int atmci_suspend(struct device *dev)
> +{
> + struct atmel_mci *host = dev_get_drvdata(dev);
> + struct atmel_mci_slot *slot;
> + int i, ret;
slot and ret can have a more local scope.
> +
> + for (i = 0; i < ATMEL_MCI_MAX_NR_SLOTS; i++) {
> + slot = host->slot[i];
> + if (!slot)
> + continue;
> + ret = mmc_suspend_host(slot->mmc);
> + if (ret < 0) {
> + while (--i >= 0) {
> + slot = host->slot[i];
> + if (slot)
> + mmc_resume_host(host->slot[i]->mmc);
hmm, mmc_resume_host could fail. But probably you cannot handle that in
a sane way, do you?
> + }
> + return ret;
> + }
> + }
> +
> + return 0;
> +}
> +
> +static int atmci_resume(struct device *dev)
> +{
> + struct atmel_mci *host = dev_get_drvdata(dev);
> + struct atmel_mci_slot *slot;
> + int i, ret;
> +
> + for (i = 0; i < ATMEL_MCI_MAX_NR_SLOTS; i++) {
> + slot = host->slot[i];
> + if (!slot)
> + continue;
> + ret = mmc_resume_host(slot->mmc);
> + if (ret < 0)
> + return ret;
Maybe you should try to resume host 5 even if resuming host 4 failed?
> + }
> +
> + return 0;
> +}
> +#endif
> +static SIMPLE_DEV_PM_OPS(atmci_pm, atmci_suspend, atmci_resume);
> +
> +
For my taste a single empty line is enough.
> static struct platform_driver atmci_driver = {
> .remove = __exit_p(atmci_remove),
> .driver = {
> .name = "atmel_mci",
> + .pm = &atmci_pm,
> },
> };
--
Pengutronix e.K. | Uwe Kleine-König |
Industrial Linux Solutions | http://www.pengutronix.de/ |
--
To unsubscribe from this list: send the line "unsubscribe linux-mmc" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
