Skip to content

Commit

Permalink
misc: tsl2550: 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>
Cc: Rodolfo Giometti <giometti@enneenne.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
Lars-Peter Clausen authored and Greg Kroah-Hartman committed Apr 11, 2013
1 parent 873bf4f commit a776102
Showing 1 changed file with 11 additions and 10 deletions.
21 changes: 11 additions & 10 deletions drivers/misc/tsl2550.c
Original file line number Diff line number Diff line change
Expand Up @@ -417,24 +417,26 @@ static int tsl2550_remove(struct i2c_client *client)
return 0;
}

#ifdef CONFIG_PM
#ifdef CONFIG_PM_SLEEP

static int tsl2550_suspend(struct i2c_client *client, pm_message_t mesg)
static int tsl2550_suspend(struct device *dev)
{
return tsl2550_set_power_state(client, 0);
return tsl2550_set_power_state(to_i2c_client(dev), 0);
}

static int tsl2550_resume(struct i2c_client *client)
static int tsl2550_resume(struct device *dev)
{
return tsl2550_set_power_state(client, 1);
return tsl2550_set_power_state(to_i2c_client(dev), 1);
}

static SIMPLE_DEV_PM_OPS(tsl2550_pm_ops, tsl2550_suspend, tsl2550_resume);
#define TSL2550_PM_OPS (&tsl2550_pm_ops)

#else

#define tsl2550_suspend NULL
#define tsl2550_resume NULL
#define TSL2550_PM_OPS NULL

#endif /* CONFIG_PM */
#endif /* CONFIG_PM_SLEEP */

static const struct i2c_device_id tsl2550_id[] = {
{ "tsl2550", 0 },
Expand All @@ -446,9 +448,8 @@ static struct i2c_driver tsl2550_driver = {
.driver = {
.name = TSL2550_DRV_NAME,
.owner = THIS_MODULE,
.pm = TSL2550_PM_OPS,
},
.suspend = tsl2550_suspend,
.resume = tsl2550_resume,
.probe = tsl2550_probe,
.remove = tsl2550_remove,
.id_table = tsl2550_id,
Expand Down

0 comments on commit a776102

Please sign in to comment.