From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1753967Ab1F3Ibi (ORCPT <rfc822;w@1wt.eu>);
	Thu, 30 Jun 2011 04:31:38 -0400
Received: from newsmtp5.atmel.com ([204.2.163.5]:6774 "EHLO sjogate2.atmel.com"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S1751167Ab1F3Ibg (ORCPT <rfc822;linux-kernel@vger.kernel.org>);
	Thu, 30 Jun 2011 04:31:36 -0400
Message-ID: <4E0C3440.9010802@atmel.com>
Date: Thu, 30 Jun 2011 10:30:56 +0200
From: Nicolas Ferre <nicolas.ferre@atmel.com>
Organization: atmel
User-Agent: Mozilla/5.0 (Windows; U; Windows NT 5.1; fr; rv:1.9.2.18) Gecko/20110616 Lightning/1.0b2 Thunderbird/3.1.11
MIME-Version: 1.0
To: "Rafael J. Wysocki" <rjw@sisk.pl>, balbi@ti.com
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,
        =?ISO-8859-2?Q?Uwe_Kleine-K=F6nig?= 
	<u.kleine-koenig@pengutronix.de>
Subject: Re: [PATCH 1/2] MMC: PM: add suspend/resume in atmel-mci
References: <1ef60c032bc39531302c1603bfcb841d2d437ccc.1309366360.git.nicolas.ferre@atmel.com> <20110629160110.GD2760@legolas.emea.dhcp.ti.com> <201106292339.12402.rjw@sisk.pl>
In-Reply-To: <201106292339.12402.rjw@sisk.pl>
X-Enigmail-Version: 1.1.1
Content-Type: text/plain; charset=ISO-8859-2
Content-Transfer-Encoding: 8bit
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

Le 29/06/2011 23:39, Rafael J. Wysocki :
> On Wednesday, June 29, 2011, Felipe Balbi wrote:
>> Hi,
>>
>> On Wed, Jun 29, 2011 at 06:54:19PM +0200, Nicolas Ferre wrote:
>>> Take care of slots while going to suspend state.
>>>
>>> Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
>>> Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
>>> ---
>>>  drivers/mmc/host/atmel-mci.c |   51 ++++++++++++++++++++++++++++++++++++++++++
>>>  1 files changed, 51 insertions(+), 0 deletions(-)
>>>
>>> diff --git a/drivers/mmc/host/atmel-mci.c b/drivers/mmc/host/atmel-mci.c
>>> index aa8039f..c414ebe 100644
>>> --- a/drivers/mmc/host/atmel-mci.c
>>> +++ b/drivers/mmc/host/atmel-mci.c
>>> @@ -1878,8 +1878,59 @@ static int __exit atmci_remove(struct platform_device *pdev)
>>>  	return 0;
>>>  }
>>>  
>>> +#ifdef CONFIG_PM
>>> +static int atmci_suspend(struct platform_device *pdev, pm_message_t mesg)
>>> +{
>>> +	struct atmel_mci *host = platform_get_drvdata(pdev);
>>> +	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_suspend_host(slot->mmc);
>>> +		if (ret < 0) {
>>> +			while (--i >= 0) {
>>> +				slot = host->slot[i];
>>> +				if (slot)
>>> +					mmc_resume_host(host->slot[i]->mmc);
>>> +			}
>>> +			return ret;
>>> +		}
>>> +	}
>>> +
>>> +	return 0;
>>> +}
>>> +
>>> +static int atmci_resume(struct platform_device *pdev)
>>> +{
>>> +	struct atmel_mci *host = platform_get_drvdata(pdev);
>>> +	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;
>>> +	}
>>> +
>>> +	return 0;
>>> +}
>>> +#else
>>> +#define atmci_suspend	NULL
>>> +#define atmci_resume	NULL
>>> +#endif
>>> +
>>> +
>>> +
>>>  static struct platform_driver atmci_driver = {
>>>  	.remove		= __exit_p(atmci_remove),
>>> +	.suspend	= atmci_suspend,
>>> +	.resume		= atmci_resume,
>>
>> should this be using dev_pm_ops instead ?
> 
> It should.  Also, please remember to initialize the hibernate callback
> pointers too, e.g. via the SIMPLE_DEV_PM_OPS() macro.

Felipe, Rafael,
Thanks for your feedback. I will implement this in a v2 patch.

BTW, should I use #ifdef CONFIG_PM or #ifdef CONFIG_PM_SLEEP?

Best regards,
-- 
Nicolas Ferre