From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751362Ab1L2Fom (ORCPT ); Thu, 29 Dec 2011 00:44:42 -0500 Received: from hqemgate04.nvidia.com ([216.228.121.35]:18486 "EHLO hqemgate04.nvidia.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750815Ab1L2Fok convert rfc822-to-8bit (ORCPT ); Thu, 29 Dec 2011 00:44:40 -0500 X-PGP-Universal: processed; by hqnvupgp06.nvidia.com on Wed, 28 Dec 2011 21:44:40 -0800 Message-ID: <4EFBFE36.2070608@nvidia.com> Date: Thu, 29 Dec 2011 14:44:22 +0900 From: Jin Park Organization: NVIDIA User-Agent: Mozilla/5.0 (Windows NT 5.1; rv:8.0) Gecko/20111105 Thunderbird/8.0 MIME-Version: 1.0 To: Mark Brown CC: Samuel Ortiz , "linux-kernel@vger.kernel.org" Subject: Re: [PATCH] mfd: Convert aat2870 to dev_pm_ops References: <1325094028-8501-1-git-send-email-broonie@opensource.wolfsonmicro.com> In-Reply-To: <1325094028-8501-1-git-send-email-broonie@opensource.wolfsonmicro.com> X-NVConfidentiality: public Content-Type: text/plain; charset="UTF-8"; format=flowed Content-Transfer-Encoding: 8BIT Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Acked-by: Jin Park On 2011-12-29 오전 2:40, Mark Brown wrote: > The I2C suspend and resume functions have been deprecated since the driver > was introduced. > > Signed-off-by: Mark Brown > --- > drivers/mfd/aat2870-core.c | 19 ++++++++++--------- > 1 files changed, 10 insertions(+), 9 deletions(-) > > diff --git a/drivers/mfd/aat2870-core.c b/drivers/mfd/aat2870-core.c > index e6da563..3aa36eb 100644 > --- a/drivers/mfd/aat2870-core.c > +++ b/drivers/mfd/aat2870-core.c > @@ -468,9 +468,10 @@ static int aat2870_i2c_remove(struct i2c_client *client) > return 0; > } > > -#ifdef CONFIG_PM > -static int aat2870_i2c_suspend(struct i2c_client *client, pm_message_t state) > +#ifdef CONFIG_PM_SLEEP > +static int aat2870_i2c_suspend(struct device *dev) > { > + struct i2c_client *client = to_i2c_client(dev); > struct aat2870_data *aat2870 = i2c_get_clientdata(client); > > aat2870_disable(aat2870); > @@ -478,8 +479,9 @@ static int aat2870_i2c_suspend(struct i2c_client *client, pm_message_t state) > return 0; > } > > -static int aat2870_i2c_resume(struct i2c_client *client) > +static int aat2870_i2c_resume(struct device *dev) > { > + struct i2c_client *client = to_i2c_client(dev); > struct aat2870_data *aat2870 = i2c_get_clientdata(client); > struct aat2870_register *reg = NULL; > int i; > @@ -495,10 +497,10 @@ static int aat2870_i2c_resume(struct i2c_client *client) > > return 0; > } > -#else > -#define aat2870_i2c_suspend NULL > -#define aat2870_i2c_resume NULL > -#endif /* CONFIG_PM */ > +#endif /* CONFIG_PM_SLEEP */ > + > +static SIMPLE_DEV_PM_OPS(aat2870_pm_ops, aat2870_i2c_suspend, > + aat2870_i2c_resume); > > static const struct i2c_device_id aat2870_i2c_id_table[] = { > { "aat2870", 0 }, > @@ -510,11 +512,10 @@ static struct i2c_driver aat2870_i2c_driver = { > .driver = { > .name = "aat2870", > .owner = THIS_MODULE, > + .pm =&aat2870_pm_ops, > }, > .probe = aat2870_i2c_probe, > .remove = aat2870_i2c_remove, > - .suspend = aat2870_i2c_suspend, > - .resume = aat2870_i2c_resume, > .id_table = aat2870_i2c_id_table, > }; >