From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753162Ab1F3NOL (ORCPT ); Thu, 30 Jun 2011 09:14:11 -0400 Received: from metis.ext.pengutronix.de ([92.198.50.35]:55590 "EHLO metis.ext.pengutronix.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753749Ab1F3NNv (ORCPT ); Thu, 30 Jun 2011 09:13:51 -0400 Date: Thu, 30 Jun 2011 15:13:42 +0200 From: Uwe =?iso-8859-1?Q?Kleine-K=F6nig?= To: Nicolas Ferre Cc: cjb@laptop.org, linux-mmc@vger.kernel.org, hans-christian.egtvedt@atmel.com, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, kernel@avr32linux.org Subject: Re: [PATCH V2] MMC: PM: add suspend/resume in atmel-mci Message-ID: <20110630131342.GK11559@pengutronix.de> References: <201106292339.12402.rjw@sisk.pl> <1309441781-11012-1-git-send-email-nicolas.ferre@atmel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <1309441781-11012-1-git-send-email-nicolas.ferre@atmel.com> User-Agent: Mutt/1.5.21 (2010-09-15) X-SA-Exim-Connect-IP: 2001:6f8:1178:2:215:17ff:fe12:23b0 X-SA-Exim-Mail-From: ukl@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: linux-kernel@vger.kernel.org Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 > Signed-off-by: Uwe Kleine-König > --- > 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/ |