Commit b6c9eeef authored by Mark Brown's avatar Mark Brown Committed by Samuel Ortiz

mfd: Don't use I2C-specific suspend and resume operations for tps65090

The legacy suspend operations have been deprecated and printing warnings
on boot for over a year now.
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: default avatarVenu Byravarasu <vbyravarasu@nvidia.com>
Signed-off-by: default avatarSamuel Ortiz <sameo@linux.intel.com>
parent 1ca5513a
...@@ -335,21 +335,27 @@ static int __devexit tps65090_i2c_remove(struct i2c_client *client) ...@@ -335,21 +335,27 @@ static int __devexit tps65090_i2c_remove(struct i2c_client *client)
} }
#ifdef CONFIG_PM_SLEEP #ifdef CONFIG_PM_SLEEP
static int tps65090_i2c_suspend(struct i2c_client *client, pm_message_t state) static int tps65090_suspend(struct device *dev)
{ {
struct i2c_client *client = to_i2c_client(dev);
if (client->irq) if (client->irq)
disable_irq(client->irq); disable_irq(client->irq);
return 0; return 0;
} }
static int tps65090_i2c_resume(struct i2c_client *client) static int tps65090_resume(struct device *dev)
{ {
struct i2c_client *client = to_i2c_client(dev);
if (client->irq) if (client->irq)
enable_irq(client->irq); enable_irq(client->irq);
return 0; return 0;
} }
#endif #endif
static const struct dev_pm_ops tps65090_pm_ops = {
SET_SYSTEM_SLEEP_PM_OPS(tps65090_suspend, tps65090_resume)
};
static const struct i2c_device_id tps65090_id_table[] = { static const struct i2c_device_id tps65090_id_table[] = {
{ "tps65090", 0 }, { "tps65090", 0 },
{ }, { },
...@@ -360,13 +366,10 @@ static struct i2c_driver tps65090_driver = { ...@@ -360,13 +366,10 @@ static struct i2c_driver tps65090_driver = {
.driver = { .driver = {
.name = "tps65090", .name = "tps65090",
.owner = THIS_MODULE, .owner = THIS_MODULE,
.pm = &tps65090_pm_ops,
}, },
.probe = tps65090_i2c_probe, .probe = tps65090_i2c_probe,
.remove = __devexit_p(tps65090_i2c_remove), .remove = __devexit_p(tps65090_i2c_remove),
#ifdef CONFIG_PM_SLEEP
.suspend = tps65090_i2c_suspend,
.resume = tps65090_i2c_resume,
#endif
.id_table = tps65090_id_table, .id_table = tps65090_id_table,
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment