lkml.org 
[lkml]   [2013]   [Mar]   [11]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [PATCH 3/5] power: sbs-battery: Use dev_pm_ops
On 3/10/2013 9:34 AM, Lars-Peter Clausen wrote:
> Use dev_pm_ops instead of the deprecated legacy suspend/resume callbacks.
>
> Cc: Rhyland Klein <rklein@nvidia.com>
> Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
> ---
> drivers/power/sbs-battery.c | 18 ++++++++++--------
> 1 file changed, 10 insertions(+), 8 deletions(-)
>
> diff --git a/drivers/power/sbs-battery.c b/drivers/power/sbs-battery.c
> index 3960f0b..6a2e335 100644
> --- a/drivers/power/sbs-battery.c
> +++ b/drivers/power/sbs-battery.c
> @@ -820,10 +820,11 @@ static int sbs_remove(struct i2c_client *client)
> return 0;
> }
>
> -#if defined CONFIG_PM
> -static int sbs_suspend(struct i2c_client *client,
> - pm_message_t state)
> +#if defined CONFIG_PM_SLEEP
> +
> +static int sbs_suspend(struct device *dev)
> {
> + struct i2c_client *client = to_i2c_client(dev);
> struct sbs_info *chip = i2c_get_clientdata(client);
> s32 ret;
>
> @@ -838,11 +839,13 @@ static int sbs_suspend(struct i2c_client *client,
>
> return 0;
> }
> +
> +static SIMPLE_DEV_PM_OPS(sbs_pm_ops, sbs_suspend, NULL);
> +#define SBS_PM_OPS (&sbs_pm_ops)
> +
> #else
> -#define sbs_suspend NULL
> +#define SBS_PM_OPS NULL
> #endif
> -/* any smbus transaction will wake up sbs */
> -#define sbs_resume NULL
>
> static const struct i2c_device_id sbs_id[] = {
> { "bq20z75", 0 },
> @@ -854,12 +857,11 @@ MODULE_DEVICE_TABLE(i2c, sbs_id);
> static struct i2c_driver sbs_battery_driver = {
> .probe = sbs_probe,
> .remove = sbs_remove,
> - .suspend = sbs_suspend,
> - .resume = sbs_resume,
> .id_table = sbs_id,
> .driver = {
> .name = "sbs-battery",
> .of_match_table = sbs_dt_ids,
> + .pm = SBS_PM_OPS,
> },
> };
> module_i2c_driver(sbs_battery_driver);
Looks got to me!
Acked-By Rhyland Klein <rklein@nvidia.com>

--
nvpublic



\
 
 \ /
  Last update: 2013-03-11 19:21    [W:0.165 / U:0.628 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site