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

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

mfd: Convert adp5520 to dev_pm_ops 



There is a move to deprecate bus-specific PM operations and move to
using dev_pm_ops instead in order to reduce the amount of boilerplate
code in buses and facilitiate updates to the PM core. Do this move for
the adp5520 driver.

Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: default avatarSamuel Ortiz <sameo@linux.intel.com>
parent df508450

drivers/mfd/adp5520.c

+7 −8
Original line number Diff line number Diff line
@@ -321,27 +321,27 @@ static int __devexit adp5520_remove(struct i2c_client *client) 
}



#ifdef CONFIG_PM

static int adp5520_suspend(struct i2c_client *client,

				 pm_message_t state)

static int adp5520_suspend(struct device *dev)

{

	struct i2c_client *client = to_i2c_client(dev);

	struct adp5520_chip *chip = dev_get_drvdata(&client->dev);



	adp5520_clr_bits(chip->dev, ADP5520_MODE_STATUS, ADP5520_nSTNBY);

	return 0;

}



static int adp5520_resume(struct i2c_client *client)

static int adp5520_resume(struct device *dev)

{

	struct i2c_client *client = to_i2c_client(dev);

	struct adp5520_chip *chip = dev_get_drvdata(&client->dev);



	adp5520_set_bits(chip->dev, ADP5520_MODE_STATUS, ADP5520_nSTNBY);

	return 0;

}

#else

#define adp5520_suspend	NULL

#define adp5520_resume	NULL

#endif



static SIMPLE_DEV_PM_OPS(adp5520_pm, adp5520_suspend, adp5520_resume);



static const struct i2c_device_id adp5520_id[] = {

	{ "pmic-adp5520", ID_ADP5520 },

	{ "pmic-adp5501", ID_ADP5501 },
@@ -353,11 +353,10 @@ static struct i2c_driver adp5520_driver = { 
	.driver = {

		.name	= "adp5520",

		.owner	= THIS_MODULE,

		.pm	= &adp5520_pm,

	},

	.probe		= adp5520_probe,

	.remove		= __devexit_p(adp5520_remove),

	.suspend	= adp5520_suspend,

	.resume		= adp5520_resume,

	.id_table 	= adp5520_id,

};