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

mfd: wm831x: Use PM ops for shutdown

Browse Source 
This helps move us towards removing the bus custom operations.

Acked-by: Charles Keepax <ckeepax@opensource.wolfsonmicro.com>
Signed-off-by: Mark Brown <broonie@linaro.org>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
This commit is contained in:
Mark Brown
2013-11-08 18:51:25 +00:00
committed by Lee Jones
parent ed83d301ea
commit b9736a16a4
2 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/mfd/wm831x-i2c.c
View File

@@ -64,11 +64,13 @@ static int wm831x_i2c_suspend(struct device *dev)
return wm831x_device_suspend(wm831x); return wm831x_device_suspend(wm831x);
} }
static void wm831x_i2c_shutdown(struct i2c_client *i2c) static int wm831x_i2c_poweroff(struct device *dev)
{ {
struct wm831x *wm831x = i2c_get_clientdata(i2c); struct wm831x *wm831x = dev_get_drvdata(dev);
wm831x_device_shutdown(wm831x); wm831x_device_shutdown(wm831x);
return 0;
} }
static const struct i2c_device_id wm831x_i2c_id[] = { static const struct i2c_device_id wm831x_i2c_id[] = {
@@ -85,6 +87,7 @@ MODULE_DEVICE_TABLE(i2c, wm831x_i2c_id);
static const struct dev_pm_ops wm831x_pm_ops = { static const struct dev_pm_ops wm831x_pm_ops = {
.suspend = wm831x_i2c_suspend, .suspend = wm831x_i2c_suspend,
.poweroff = wm831x_i2c_poweroff,
}; };
static struct i2c_driver wm831x_i2c_driver = { static struct i2c_driver wm831x_i2c_driver = {
@@ -95,7 +98,6 @@ static struct i2c_driver wm831x_i2c_driver = {
}, },
.probe = wm831x_i2c_probe, .probe = wm831x_i2c_probe,
.remove = wm831x_i2c_remove, .remove = wm831x_i2c_remove,
.shutdown = wm831x_i2c_shutdown,
.id_table = wm831x_i2c_id, .id_table = wm831x_i2c_id,
}; };

8
drivers/mfd/wm831x-spi.c
View File

@@ -66,16 +66,19 @@ static int wm831x_spi_suspend(struct device *dev)
return wm831x_device_suspend(wm831x); return wm831x_device_suspend(wm831x);
} }
static void wm831x_spi_shutdown(struct spi_device *spi) static int wm831x_spi_poweroff(struct device *dev)
{ {
struct wm831x *wm831x = spi_get_drvdata(spi); struct wm831x *wm831x = dev_get_drvdata(dev);
wm831x_device_shutdown(wm831x); wm831x_device_shutdown(wm831x);
return 0;
} }
static const struct dev_pm_ops wm831x_spi_pm = { static const struct dev_pm_ops wm831x_spi_pm = {
.freeze = wm831x_spi_suspend, .freeze = wm831x_spi_suspend,
.suspend = wm831x_spi_suspend, .suspend = wm831x_spi_suspend,
.poweroff = wm831x_spi_poweroff,
}; };
static const struct spi_device_id wm831x_spi_ids[] = { static const struct spi_device_id wm831x_spi_ids[] = {
@@ -99,7 +102,6 @@ static struct spi_driver wm831x_spi_driver = {
.id_table = wm831x_spi_ids, .id_table = wm831x_spi_ids,
.probe = wm831x_spi_probe, .probe = wm831x_spi_probe,
.remove = wm831x_spi_remove, .remove = wm831x_spi_remove,
.shutdown = wm831x_spi_shutdown,
}; };
static int __init wm831x_spi_init(void) static int __init wm831x_spi_init(void)