From: Jin Park <jinyoungp@nvidia.com>
To: Mark Brown <broonie@opensource.wolfsonmicro.com>
Cc: Samuel Ortiz <sameo@linux.intel.com>,
"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>
Subject: Re: [PATCH] mfd: Convert aat2870 to dev_pm_ops
Date: Thu, 29 Dec 2011 14:44:22 +0900 [thread overview]
Message-ID: <4EFBFE36.2070608@nvidia.com> (raw)
In-Reply-To: <1325094028-8501-1-git-send-email-broonie@opensource.wolfsonmicro.com>
Acked-by: Jin Park <jinyoungp@nvidia.com>
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<broonie@opensource.wolfsonmicro.com>
> ---
> 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,
> };
>
next prev parent reply other threads:[~2011-12-29 5:44 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-12-28 17:40 [PATCH] mfd: Convert aat2870 to dev_pm_ops Mark Brown
2011-12-29 5:44 ` Jin Park [this message]
2012-01-08 23:25 ` Samuel Ortiz
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=4EFBFE36.2070608@nvidia.com \
--to=jinyoungp@nvidia.com \
--cc=broonie@opensource.wolfsonmicro.com \
--cc=linux-kernel@vger.kernel.org \
--cc=sameo@linux.intel.com \
/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