diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-01-05 15:12:39 +0000 |
|---|---|---|
| committer | Samuel Ortiz <sameo@linux.intel.com> | 2011-01-14 12:38:17 +0100 |
| commit | c538ddbe4fc70ef97af02d57abad34b246b19082 (patch) | |
| tree | e6f41e7217194e9d48d6f5b2b72e39f280eb2b23 | |
| parent | 735a3d9efdc5aeebe201008e6655b235c7f02aeb (diff) | |
| download | linux-c538ddbe4fc70ef97af02d57abad34b246b19082.tar.bz2 | |
mfd: Convert WM831x away from legacy I2C PM operations
Since the legacy bus PM operations are deprecated move the suspend
method over to dev_pm_ops.
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
| -rw-r--r-- | drivers/mfd/wm831x-i2c.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/drivers/mfd/wm831x-i2c.c b/drivers/mfd/wm831x-i2c.c index 38be5201c783..3853fa8e7cc2 100644 --- a/drivers/mfd/wm831x-i2c.c +++ b/drivers/mfd/wm831x-i2c.c @@ -94,9 +94,9 @@ static int wm831x_i2c_remove(struct i2c_client *i2c) return 0; } -static int wm831x_i2c_suspend(struct i2c_client *i2c, pm_message_t mesg) +static int wm831x_i2c_suspend(struct device *dev) { - struct wm831x *wm831x = i2c_get_clientdata(i2c); + struct wm831x *wm831x = dev_get_drvdata(dev); return wm831x_device_suspend(wm831x); } @@ -113,15 +113,18 @@ static const struct i2c_device_id wm831x_i2c_id[] = { }; MODULE_DEVICE_TABLE(i2c, wm831x_i2c_id); +static const struct dev_pm_ops wm831x_pm_ops = { + .suspend = wm831x_i2c_suspend, +}; static struct i2c_driver wm831x_i2c_driver = { .driver = { - .name = "wm831x", - .owner = THIS_MODULE, + .name = "wm831x", + .owner = THIS_MODULE, + .pm = &wm831x_pm_ops, }, .probe = wm831x_i2c_probe, .remove = wm831x_i2c_remove, - .suspend = wm831x_i2c_suspend, .id_table = wm831x_i2c_id, }; |