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

Commit 52f30f77 authored by Mark Brown's avatar Mark Brown Committed by Guenter Roeck
Browse files

hwmon: (max6639) Convert to dev_pm_ops 



The I2C specific PM operations have been deprecated and printing a
warning on boot for over a year now.

Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
[guenter.roeck@ericsson.com: Added missing #ifdef around pm functions]
Cc: stable@vger.kernel.org # 3.0+
Signed-off-by: default avatarGuenter Roeck <guenter.roeck@ericsson.com>
parent be45d422

drivers/hwmon/max6639.c

+11 −4
Original line number Diff line number Diff line
@@ -596,8 +596,10 @@ static int max6639_remove(struct i2c_client *client) 
	return 0;

}



static int max6639_suspend(struct i2c_client *client, pm_message_t mesg)

#ifdef CONFIG_PM_SLEEP

static int max6639_suspend(struct device *dev)

{

	struct i2c_client *client = to_i2c_client(dev);

	int data = i2c_smbus_read_byte_data(client, MAX6639_REG_GCONFIG);

	if (data < 0)

		return data;
@@ -606,8 +608,9 @@ static int max6639_suspend(struct i2c_client *client, pm_message_t mesg) 
			MAX6639_REG_GCONFIG, data | MAX6639_GCONFIG_STANDBY);

}



static int max6639_resume(struct i2c_client *client)

static int max6639_resume(struct device *dev)

{

	struct i2c_client *client = to_i2c_client(dev);

	int data = i2c_smbus_read_byte_data(client, MAX6639_REG_GCONFIG);

	if (data < 0)

		return data;
@@ -615,6 +618,7 @@ static int max6639_resume(struct i2c_client *client) 
	return i2c_smbus_write_byte_data(client,

			MAX6639_REG_GCONFIG, data & ~MAX6639_GCONFIG_STANDBY);

}

#endif /* CONFIG_PM_SLEEP */



static const struct i2c_device_id max6639_id[] = {

	{"max6639", 0},
@@ -623,15 +627,18 @@ static const struct i2c_device_id max6639_id[] = { 


MODULE_DEVICE_TABLE(i2c, max6639_id);



static const struct dev_pm_ops max6639_pm_ops = {

	SET_SYSTEM_SLEEP_PM_OPS(max6639_suspend, max6639_resume)

};



static struct i2c_driver max6639_driver = {

	.class = I2C_CLASS_HWMON,

	.driver = {

		   .name = "max6639",

		   .pm = &max6639_pm_ops,

		   },

	.probe = max6639_probe,

	.remove = max6639_remove,

	.suspend = max6639_suspend,

	.resume = max6639_resume,

	.id_table = max6639_id,

	.detect = max6639_detect,

	.address_list = normal_i2c,