diff options
| author | Lars-Peter Clausen <lars@metafoo.de> | 2013-03-10 14:34:07 +0100 |
|---|---|---|
| committer | Anton Vorontsov <anton@enomsg.org> | 2013-03-31 23:01:17 -0700 |
| commit | 9c1d1af0cf78a7e8967194a4ee424b0742a52921 (patch) | |
| tree | eba6e16984ffb2addd994a0c90857c62c725704f /drivers/power | |
| parent | 43cf454aba2516799d571472fa69425e1e15c4bc (diff) | |
| download | linux-stable-9c1d1af0cf78a7e8967194a4ee424b0742a52921.tar.gz linux-stable-9c1d1af0cf78a7e8967194a4ee424b0742a52921.tar.bz2 linux-stable-9c1d1af0cf78a7e8967194a4ee424b0742a52921.zip | |
sbs-battery: Use dev_pm_ops
Use dev_pm_ops instead of the deprecated legacy suspend/resume callbacks.
Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
Acked-by: Rhyland Klein <rklein@nvidia.com>
Signed-off-by: Anton Vorontsov <anton@enomsg.org>
Diffstat (limited to 'drivers/power')
| -rw-r--r-- | drivers/power/sbs-battery.c | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/drivers/power/sbs-battery.c b/drivers/power/sbs-battery.c index 3922f06120c8..c8c78a74e75a 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 = of_match_ptr(sbs_dt_ids), + .pm = SBS_PM_OPS, }, }; module_i2c_driver(sbs_battery_driver); |