redonkable/remarkable-linux
redonkable/remarkable-linux
1
0
Fork 0
Code Releases Activity

staging: cptm1217: Use dev_pm_ops

Browse source 
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>
This commit is contained in:
Lars-Peter Clausen 2013-04-08 09:56:07 +02:00 committed by Greg Kroah-Hartman
parent c6ac992b8f
commit bc73488cb7
1 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
drivers/staging/cptm1217/clearpad_tm1217.c
View file

@ -557,12 +557,15 @@ fail:
} }
#ifdef CONFIG_PM_SLEEP
/* /*
* cp_tm1217 suspend * 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); struct cp_tm1217_device *ts = i2c_get_clientdata(client);
u8 req[2]; u8 req[2];
int retval; int retval;
@ -583,8 +586,9 @@ static int cp_tm1217_suspend(struct i2c_client *client, pm_message_t mesg)
* cp_tm1217_resume * 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); struct cp_tm1217_device *ts = i2c_get_clientdata(client);
u8 req[2]; u8 req[2];
int retval; int retval;
@ -618,6 +622,11 @@ static int cp_tm1217_resume(struct i2c_client *client)
return 0; return 0;
} }
#endif
static SIMPLE_DEV_PM_OPS(cp_tm1217_pm_ops, cp_tm1217_suspend,
cp_tm1217_resume);
/* /*
* cp_tm1217_remove * cp_tm1217_remove
* *
@ -647,12 +656,11 @@ static struct i2c_driver cp_tm1217_driver = {
.driver = { .driver = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
.name = CPTM1217_DRIVER_NAME, .name = CPTM1217_DRIVER_NAME,
.pm = &cp_tm1217_pm_ops,
}, },
.id_table = cp_tm1217_idtable, .id_table = cp_tm1217_idtable,
.probe = cp_tm1217_probe, .probe = cp_tm1217_probe,
.remove = cp_tm1217_remove, .remove = cp_tm1217_remove,
.suspend = cp_tm1217_suspend,
.resume = cp_tm1217_resume,
}; };
module_i2c_driver(cp_tm1217_driver); module_i2c_driver(cp_tm1217_driver);