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

Commit 5214e565 authored by Mark Brown's avatar Mark Brown Committed by Samuel Ortiz
Browse files

mfd: Convert aat2870 to dev_pm_ops 



The I2C suspend and resume functions have been deprecated since the driver
was introduced.

Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: default avatarJin Park <jinyoungp@nvidia.com>
Signed-off-by: default avatarSamuel Ortiz <sameo@linux.intel.com>
parent 953c7d02

drivers/mfd/aat2870-core.c

+10 −9
Original line number Diff line number Diff line
@@ -468,9 +468,10 @@ static int aat2870_i2c_remove(struct i2c_client *client) 
	return 0;

}



#ifdef CONFIG_PM

static int aat2870_i2c_suspend(struct i2c_client *client, pm_message_t state)

#ifdef CONFIG_PM_SLEEP

static int aat2870_i2c_suspend(struct device *dev)

{

	struct i2c_client *client = to_i2c_client(dev);

	struct aat2870_data *aat2870 = i2c_get_clientdata(client);



	aat2870_disable(aat2870);
@@ -478,8 +479,9 @@ static int aat2870_i2c_suspend(struct i2c_client *client, pm_message_t state) 
	return 0;

}



static int aat2870_i2c_resume(struct i2c_client *client)

static int aat2870_i2c_resume(struct device *dev)

{

	struct i2c_client *client = to_i2c_client(dev);

	struct aat2870_data *aat2870 = i2c_get_clientdata(client);

	struct aat2870_register *reg = NULL;

	int i;
@@ -495,10 +497,10 @@ static int aat2870_i2c_resume(struct i2c_client *client) 


	return 0;

}

#else

#define aat2870_i2c_suspend	NULL

#define aat2870_i2c_resume	NULL

#endif /* CONFIG_PM */

#endif /* CONFIG_PM_SLEEP */



static SIMPLE_DEV_PM_OPS(aat2870_pm_ops, aat2870_i2c_suspend,

			 aat2870_i2c_resume);



static const struct i2c_device_id aat2870_i2c_id_table[] = {

	{ "aat2870", 0 },
@@ -510,11 +512,10 @@ static struct i2c_driver aat2870_i2c_driver = { 
	.driver = {

		.name	= "aat2870",

		.owner	= THIS_MODULE,

		.pm	= &aat2870_pm_ops,

	},

	.probe		= aat2870_i2c_probe,

	.remove		= aat2870_i2c_remove,

	.suspend	= aat2870_i2c_suspend,

	.resume		= aat2870_i2c_resume,

	.id_table	= aat2870_i2c_id_table,

};