lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

mfd: Convert adp5520 to dev_pm_ops

Browse Source 
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: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
This commit is contained in:
Mark Brown
2011-01-20 21:45:46 +00:00
committed by Samuel Ortiz
parent df50845087
commit dc78145469
1 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
drivers/mfd/adp5520.c
View File

@@ -321,27 +321,27 @@ static int __devexit adp5520_remove(struct i2c_client *client)
} }
#ifdef CONFIG_PM #ifdef CONFIG_PM
static int adp5520_suspend(struct i2c_client *client, static int adp5520_suspend(struct device *dev)
pm_message_t state)
{ {
struct i2c_client *client = to_i2c_client(dev);
struct adp5520_chip *chip = dev_get_drvdata(&client->dev); struct adp5520_chip *chip = dev_get_drvdata(&client->dev);
adp5520_clr_bits(chip->dev, ADP5520_MODE_STATUS, ADP5520_nSTNBY); adp5520_clr_bits(chip->dev, ADP5520_MODE_STATUS, ADP5520_nSTNBY);
return 0; 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); struct adp5520_chip *chip = dev_get_drvdata(&client->dev);
adp5520_set_bits(chip->dev, ADP5520_MODE_STATUS, ADP5520_nSTNBY); adp5520_set_bits(chip->dev, ADP5520_MODE_STATUS, ADP5520_nSTNBY);
return 0; return 0;
} }
#else
#define adp5520_suspend NULL
#define adp5520_resume NULL
#endif #endif
static SIMPLE_DEV_PM_OPS(adp5520_pm, adp5520_suspend, adp5520_resume);
static const struct i2c_device_id adp5520_id[] = { static const struct i2c_device_id adp5520_id[] = {
{ "pmic-adp5520", ID_ADP5520 }, { "pmic-adp5520", ID_ADP5520 },
{ "pmic-adp5501", ID_ADP5501 }, { "pmic-adp5501", ID_ADP5501 },
@@ -353,11 +353,10 @@ static struct i2c_driver adp5520_driver = {
.driver = { .driver = {
.name = "adp5520", .name = "adp5520",
.owner = THIS_MODULE, .owner = THIS_MODULE,
.pm = &adp5520_pm,
}, },
.probe = adp5520_probe, .probe = adp5520_probe,
.remove = __devexit_p(adp5520_remove), .remove = __devexit_p(adp5520_remove),
.suspend = adp5520_suspend,
.resume = adp5520_resume,
.id_table = adp5520_id, .id_table = adp5520_id,
}; };