Skip to content

Commit

Permalink
staging: cptm1217: 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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
Lars-Peter Clausen authored and Greg Kroah-Hartman committed Apr 8, 2013
1 parent c6ac992 commit bc73488
Showing 1 changed file with 12 additions and 4 deletions.
16 changes: 12 additions & 4 deletions drivers/staging/cptm1217/clearpad_tm1217.c
Original file line number Diff line number Diff line change
Expand Up @@ -557,12 +557,15 @@ static int cp_tm1217_probe(struct i2c_client *client,

}

#ifdef CONFIG_PM_SLEEP

/*
* cp_tm1217 suspend
*
*/
static int cp_tm1217_suspend(struct i2c_client *client, pm_message_t mesg)
static int cp_tm1217_suspend(struct device *dev)
{
struct i2c_client *client = to_i2c_client(dev);
struct cp_tm1217_device *ts = i2c_get_clientdata(client);
u8 req[2];
int retval;
Expand All @@ -583,8 +586,9 @@ static int cp_tm1217_suspend(struct i2c_client *client, pm_message_t mesg)
* cp_tm1217_resume
*
*/
static int cp_tm1217_resume(struct i2c_client *client)
static int cp_tm1217_resume(struct device *dev)
{
struct i2c_client *client = to_i2c_client(dev);
struct cp_tm1217_device *ts = i2c_get_clientdata(client);
u8 req[2];
int retval;
Expand Down Expand Up @@ -618,6 +622,11 @@ static int cp_tm1217_resume(struct i2c_client *client)
return 0;
}

#endif

static SIMPLE_DEV_PM_OPS(cp_tm1217_pm_ops, cp_tm1217_suspend,
cp_tm1217_resume);

/*
* cp_tm1217_remove
*
Expand Down Expand Up @@ -647,12 +656,11 @@ static struct i2c_driver cp_tm1217_driver = {
.driver = {
.owner = THIS_MODULE,
.name = CPTM1217_DRIVER_NAME,
.pm = &cp_tm1217_pm_ops,
},
.id_table = cp_tm1217_idtable,
.probe = cp_tm1217_probe,
.remove = cp_tm1217_remove,
.suspend = cp_tm1217_suspend,
.resume = cp_tm1217_resume,
};

module_i2c_driver(cp_tm1217_driver);
Expand Down

0 comments on commit bc73488

Please sign in to comment.