Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bc73488c authored by Lars-Peter Clausen's avatar Lars-Peter Clausen Committed by Greg Kroah-Hartman
Browse files

staging: cptm1217: Use dev_pm_ops 



Use dev_pm_ops instead of the deprecated legacy suspend/resume callbacks.

Signed-off-by: default avatarLars-Peter Clausen <lars@metafoo.de>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent c6ac992b

drivers/staging/cptm1217/clearpad_tm1217.c

+12 −4
Original line number Diff line number Diff line
@@ -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;
@@ -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;
@@ -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

 *
@@ -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);