Skip to content

Commit

Permalink
sbs-battery: Use dev_pm_ops
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Lars-Peter Clausen authored and Anton Vorontsov committed Apr 1, 2013
1 parent 43cf454 commit 9c1d1af
Showing 1 changed file with 10 additions and 8 deletions.
18 changes: 10 additions & 8 deletions drivers/power/sbs-battery.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand All @@ -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 },
Expand All @@ -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);
Expand Down

0 comments on commit 9c1d1af

Please sign in to comment.