lkml.org 
[lkml]   [2011]   [Dec]   [29]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [PATCH] mfd: Convert aat2870 to dev_pm_ops
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,
> };
>
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

\
 
 \ /
  Last update: 2011-12-29 06:47    [W:0.440 / U:0.076 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site