* [PATCH] mfd: wm831x: Use PM ops for shutdown
@ 2013-11-08 18:51 Mark Brown
2013-11-08 18:51 ` Mark Brown
2013-12-04 8:13 ` Lee Jones
0 siblings, 2 replies; 4+ messages in thread
From: Mark Brown @ 2013-11-08 18:51 UTC (permalink / raw)
To: Samuel Ortiz, Lee Jones; +Cc: patches, linux-kernel, linaro-kernel, Mark Brown
From: Mark Brown <broonie@linaro.org>
This helps move us towards removing the bus custom operations.
Signed-off-by: Mark Brown <broonie@linaro.org>
---
drivers/mfd/wm831x-i2c.c | 8 +++++---
drivers/mfd/wm831x-spi.c | 8 +++++---
2 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/drivers/mfd/wm831x-i2c.c b/drivers/mfd/wm831x-i2c.c
index 2b29cae..a4cbefe 100644
--- a/drivers/mfd/wm831x-i2c.c
+++ b/drivers/mfd/wm831x-i2c.c
@@ -64,11 +64,13 @@ static int wm831x_i2c_suspend(struct device *dev)
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);
+
+ return 0;
}
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 = {
.suspend = wm831x_i2c_suspend,
+ .poweroff = wm831x_i2c_poweroff,
};
static struct i2c_driver wm831x_i2c_driver = {
@@ -95,7 +98,6 @@ static struct i2c_driver wm831x_i2c_driver = {
},
.probe = wm831x_i2c_probe,
.remove = wm831x_i2c_remove,
- .shutdown = wm831x_i2c_shutdown,
.id_table = wm831x_i2c_id,
};
diff --git a/drivers/mfd/wm831x-spi.c b/drivers/mfd/wm831x-spi.c
index 07de3cc..b8a5e3b 100644
--- a/drivers/mfd/wm831x-spi.c
+++ b/drivers/mfd/wm831x-spi.c
@@ -66,16 +66,19 @@ static int wm831x_spi_suspend(struct device *dev)
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);
+
+ return 0;
}
static const struct dev_pm_ops wm831x_spi_pm = {
.freeze = wm831x_spi_suspend,
.suspend = wm831x_spi_suspend,
+ .poweroff = wm831x_spi_poweroff,
};
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,
.probe = wm831x_spi_probe,
.remove = wm831x_spi_remove,
- .shutdown = wm831x_spi_shutdown,
};
static int __init wm831x_spi_init(void)
--
1.8.4.2
^ permalink raw reply related [flat|nested] 4+ messages in thread* [PATCH] mfd: wm831x: Use PM ops for shutdown
2013-11-08 18:51 [PATCH] mfd: wm831x: Use PM ops for shutdown Mark Brown
@ 2013-11-08 18:51 ` Mark Brown
2013-11-09 12:09 ` Charles Keepax
2013-12-04 8:13 ` Lee Jones
1 sibling, 1 reply; 4+ messages in thread
From: Mark Brown @ 2013-11-08 18:51 UTC (permalink / raw)
To: Samuel Ortiz, Lee Jones; +Cc: patches, linux-kernel, linaro-kernel, Mark Brown
From: Mark Brown <broonie@linaro.org>
This helps move us towards removing the bus custom operations.
Signed-off-by: Mark Brown <broonie@linaro.org>
---
drivers/mfd/wm831x-i2c.c | 8 +++++---
drivers/mfd/wm831x-spi.c | 8 +++++---
2 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/drivers/mfd/wm831x-i2c.c b/drivers/mfd/wm831x-i2c.c
index 2b29cae..a4cbefe 100644
--- a/drivers/mfd/wm831x-i2c.c
+++ b/drivers/mfd/wm831x-i2c.c
@@ -64,11 +64,13 @@ static int wm831x_i2c_suspend(struct device *dev)
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);
+
+ return 0;
}
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 = {
.suspend = wm831x_i2c_suspend,
+ .poweroff = wm831x_i2c_poweroff,
};
static struct i2c_driver wm831x_i2c_driver = {
@@ -95,7 +98,6 @@ static struct i2c_driver wm831x_i2c_driver = {
},
.probe = wm831x_i2c_probe,
.remove = wm831x_i2c_remove,
- .shutdown = wm831x_i2c_shutdown,
.id_table = wm831x_i2c_id,
};
diff --git a/drivers/mfd/wm831x-spi.c b/drivers/mfd/wm831x-spi.c
index 07de3cc..b8a5e3b 100644
--- a/drivers/mfd/wm831x-spi.c
+++ b/drivers/mfd/wm831x-spi.c
@@ -66,16 +66,19 @@ static int wm831x_spi_suspend(struct device *dev)
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);
+
+ return 0;
}
static const struct dev_pm_ops wm831x_spi_pm = {
.freeze = wm831x_spi_suspend,
.suspend = wm831x_spi_suspend,
+ .poweroff = wm831x_spi_poweroff,
};
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,
.probe = wm831x_spi_probe,
.remove = wm831x_spi_remove,
- .shutdown = wm831x_spi_shutdown,
};
static int __init wm831x_spi_init(void)
--
1.8.4.2
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH] mfd: wm831x: Use PM ops for shutdown
2013-11-08 18:51 ` Mark Brown
@ 2013-11-09 12:09 ` Charles Keepax
0 siblings, 0 replies; 4+ messages in thread
From: Charles Keepax @ 2013-11-09 12:09 UTC (permalink / raw)
To: Mark Brown
Cc: Samuel Ortiz, Lee Jones, patches, linux-kernel, linaro-kernel,
Mark Brown
On Fri, Nov 08, 2013 at 06:51:26PM +0000, Mark Brown wrote:
> From: Mark Brown <broonie@linaro.org>
>
> This helps move us towards removing the bus custom operations.
>
> Signed-off-by: Mark Brown <broonie@linaro.org>
Acked-by: Charles Keepax <ckeepax@opensource.wolfsonmicro.com>
Thanks,
Charles
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] mfd: wm831x: Use PM ops for shutdown
2013-11-08 18:51 [PATCH] mfd: wm831x: Use PM ops for shutdown Mark Brown
2013-11-08 18:51 ` Mark Brown
@ 2013-12-04 8:13 ` Lee Jones
1 sibling, 0 replies; 4+ messages in thread
From: Lee Jones @ 2013-12-04 8:13 UTC (permalink / raw)
To: Mark Brown; +Cc: Samuel Ortiz, patches, linux-kernel, linaro-kernel, Mark Brown
On Fri, 08 Nov 2013, Mark Brown wrote:
> From: Mark Brown <broonie@linaro.org>
>
> This helps move us towards removing the bus custom operations.
>
> Signed-off-by: Mark Brown <broonie@linaro.org>
> ---
> drivers/mfd/wm831x-i2c.c | 8 +++++---
> drivers/mfd/wm831x-spi.c | 8 +++++---
> 2 files changed, 10 insertions(+), 6 deletions(-)
Applied, thanks.
--
Lee Jones
Linaro STMicroelectronics Landing Team Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2013-12-04 8:14 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-11-08 18:51 [PATCH] mfd: wm831x: Use PM ops for shutdown Mark Brown
2013-11-08 18:51 ` Mark Brown
2013-11-09 12:09 ` Charles Keepax
2013-12-04 8:13 ` Lee Jones
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).