* [PATCH 1/7] i2c-at91: Use struct dev_pm_ops for power management
2012-07-11 19:21 [PATCH 0/7] PM / I2C: Convert platform I2C drivers to PM handling based on struct dev_pm_ops Rafael J. Wysocki
@ 2012-07-11 19:22 ` Rafael J. Wysocki
2012-07-11 19:23 ` [PATCH 2/7] i2c-bfin-twi: " Rafael J. Wysocki
` (6 subsequent siblings)
7 siblings, 0 replies; 14+ messages in thread
From: Rafael J. Wysocki @ 2012-07-11 19:22 UTC (permalink / raw)
To: LKML
Cc: Linux PM list, Linus Walleij, linux-i2c, Sonic Zhang,
Jean Delvare, Ben Dooks, Wolfram Sang, Peter Korsgaard,
Guan Xuetao, Vitaly Wool, Colin Cross, Stephen Warren
From: Rafael J. Wysocki <rjw@sisk.pl>
Make the AT91 Two-Wire Interface driver define its PM callbacks
through a struct dev_pm_ops object rather than by using legacy PM
hooks in struct platform_driver.
Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
---
drivers/i2c/busses/i2c-at91.c | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
Index: linux/drivers/i2c/busses/i2c-at91.c
===================================================================
--- linux.orig/drivers/i2c/busses/i2c-at91.c
+++ linux/drivers/i2c/busses/i2c-at91.c
@@ -279,30 +279,31 @@ static int __devexit at91_i2c_remove(str
/* NOTE: could save a few mA by keeping clock off outside of at91_xfer... */
-static int at91_i2c_suspend(struct platform_device *pdev, pm_message_t mesg)
+static int at91_i2c_suspend(struct device *dev)
{
clk_disable(twi_clk);
return 0;
}
-static int at91_i2c_resume(struct platform_device *pdev)
+static int at91_i2c_resume(struct device *dev)
{
return clk_enable(twi_clk);
}
+static SIMPLE_DEV_PM_OPS(at91_i2c_pm, at91_i2c_suspend, at91_i2c_resume);
+#define AT91_I2C_PM (&at91_i2c_pm)
+
#else
-#define at91_i2c_suspend NULL
-#define at91_i2c_resume NULL
+#define AT91_I2C_PM NULL
#endif
static struct platform_driver at91_i2c_driver = {
.probe = at91_i2c_probe,
.remove = __devexit_p(at91_i2c_remove),
- .suspend = at91_i2c_suspend,
- .resume = at91_i2c_resume,
.driver = {
.name = "at91_i2c",
.owner = THIS_MODULE,
+ .pm = AT91_I2C_PM,
},
};
^ permalink raw reply [flat|nested] 14+ messages in thread* [PATCH 2/7] i2c-bfin-twi: Use struct dev_pm_ops for power management
2012-07-11 19:21 [PATCH 0/7] PM / I2C: Convert platform I2C drivers to PM handling based on struct dev_pm_ops Rafael J. Wysocki
2012-07-11 19:22 ` [PATCH 1/7] i2c-at91: Use struct dev_pm_ops for power management Rafael J. Wysocki
@ 2012-07-11 19:23 ` Rafael J. Wysocki
2012-07-12 2:51 ` Zhang, Sonic
2012-07-11 19:24 ` [PATCH 3/7] i2c-ocores: " Rafael J. Wysocki
` (5 subsequent siblings)
7 siblings, 1 reply; 14+ messages in thread
From: Rafael J. Wysocki @ 2012-07-11 19:23 UTC (permalink / raw)
To: LKML
Cc: Linux PM list, Linus Walleij, linux-i2c, Sonic Zhang,
Jean Delvare, Ben Dooks, Wolfram Sang, Peter Korsgaard,
Guan Xuetao, Vitaly Wool, Colin Cross, Stephen Warren
From: Rafael J. Wysocki <rjw@sisk.pl>
Make the Blackfin On-Chip Two Wire Interface driver define its PM
callbacks through a struct dev_pm_ops object rather than by using
legacy PM hooks in struct platform_driver.
Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
---
drivers/i2c/busses/i2c-bfin-twi.c | 18 ++++++++++--------
1 file changed, 10 insertions(+), 8 deletions(-)
Index: linux/drivers/i2c/busses/i2c-bfin-twi.c
===================================================================
--- linux.orig/drivers/i2c/busses/i2c-bfin-twi.c
+++ linux/drivers/i2c/busses/i2c-bfin-twi.c
@@ -611,9 +611,9 @@ static struct i2c_algorithm bfin_twi_alg
.functionality = bfin_twi_functionality,
};
-static int i2c_bfin_twi_suspend(struct platform_device *pdev, pm_message_t state)
+static int i2c_bfin_twi_suspend(struct device *dev)
{
- struct bfin_twi_iface *iface = platform_get_drvdata(pdev);
+ struct bfin_twi_iface *iface = dev_get_drvdata(dev);
iface->saved_clkdiv = read_CLKDIV(iface);
iface->saved_control = read_CONTROL(iface);
@@ -626,14 +626,14 @@ static int i2c_bfin_twi_suspend(struct p
return 0;
}
-static int i2c_bfin_twi_resume(struct platform_device *pdev)
+static int i2c_bfin_twi_resume(struct device *dev)
{
- struct bfin_twi_iface *iface = platform_get_drvdata(pdev);
+ struct bfin_twi_iface *iface = dev_get_drvdata(dev);
int rc = request_irq(iface->irq, bfin_twi_interrupt_entry,
- 0, pdev->name, iface);
+ 0, to_platform_device(dev)->name, iface);
if (rc) {
- dev_err(&pdev->dev, "Can't get IRQ %d !\n", iface->irq);
+ dev_err(dev, "Can't get IRQ %d !\n", iface->irq);
return -ENODEV;
}
@@ -646,6 +646,9 @@ static int i2c_bfin_twi_resume(struct pl
return 0;
}
+static SIMPLE_DEV_PM_OPS(i2c_bfin_twi_pm,
+ i2c_bfin_twi_suspend, i2c_bfin_twi_resume);
+
static int i2c_bfin_twi_probe(struct platform_device *pdev)
{
struct bfin_twi_iface *iface;
@@ -770,11 +773,10 @@ static int i2c_bfin_twi_remove(struct pl
static struct platform_driver i2c_bfin_twi_driver = {
.probe = i2c_bfin_twi_probe,
.remove = i2c_bfin_twi_remove,
- .suspend = i2c_bfin_twi_suspend,
- .resume = i2c_bfin_twi_resume,
.driver = {
.name = "i2c-bfin-twi",
.owner = THIS_MODULE,
+ .pm = &i2c_bfin_twi_pm,
},
};
^ permalink raw reply [flat|nested] 14+ messages in thread* RE: [PATCH 2/7] i2c-bfin-twi: Use struct dev_pm_ops for power management
2012-07-11 19:23 ` [PATCH 2/7] i2c-bfin-twi: " Rafael J. Wysocki
@ 2012-07-12 2:51 ` Zhang, Sonic
0 siblings, 0 replies; 14+ messages in thread
From: Zhang, Sonic @ 2012-07-12 2:51 UTC (permalink / raw)
To: Rafael J. Wysocki, LKML
Cc: Linux PM list, Linus Walleij, linux-i2c@vger.kernel.org,
Jean Delvare, Ben Dooks, Wolfram Sang, Peter Korsgaard,
Guan Xuetao, Vitaly Wool, Colin Cross, Stephen Warren
Acked-by: Sonic Zhang <sonic.zhang@analog.com>
>-----Original Message-----
>From: Rafael J. Wysocki [mailto:rjw@sisk.pl]
>Sent: Thursday, July 12, 2012 3:24 AM
>To: LKML
>Cc: Linux PM list; Linus Walleij; linux-i2c@vger.kernel.org; Zhang, Sonic; Jean
>Delvare; Ben Dooks; Wolfram Sang; Peter Korsgaard; Guan Xuetao; Vitaly Wool;
>Colin Cross; Stephen Warren
>Subject: [PATCH 2/7] i2c-bfin-twi: Use struct dev_pm_ops for power management
>
>From: Rafael J. Wysocki <rjw@sisk.pl>
>
>Make the Blackfin On-Chip Two Wire Interface driver define its PM
>callbacks through a struct dev_pm_ops object rather than by using
>legacy PM hooks in struct platform_driver.
>
>Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
>---
> drivers/i2c/busses/i2c-bfin-twi.c | 18 ++++++++++--------
> 1 file changed, 10 insertions(+), 8 deletions(-)
>
>Index: linux/drivers/i2c/busses/i2c-bfin-twi.c
>=============================================================
>======
>--- linux.orig/drivers/i2c/busses/i2c-bfin-twi.c
>+++ linux/drivers/i2c/busses/i2c-bfin-twi.c
>@@ -611,9 +611,9 @@ static struct i2c_algorithm bfin_twi_alg
> .functionality = bfin_twi_functionality,
> };
>
>-static int i2c_bfin_twi_suspend(struct platform_device *pdev, pm_message_t
>state)
>+static int i2c_bfin_twi_suspend(struct device *dev)
> {
>- struct bfin_twi_iface *iface = platform_get_drvdata(pdev);
>+ struct bfin_twi_iface *iface = dev_get_drvdata(dev);
>
> iface->saved_clkdiv = read_CLKDIV(iface);
> iface->saved_control = read_CONTROL(iface);
>@@ -626,14 +626,14 @@ static int i2c_bfin_twi_suspend(struct p
> return 0;
> }
>
>-static int i2c_bfin_twi_resume(struct platform_device *pdev)
>+static int i2c_bfin_twi_resume(struct device *dev)
> {
>- struct bfin_twi_iface *iface = platform_get_drvdata(pdev);
>+ struct bfin_twi_iface *iface = dev_get_drvdata(dev);
>
> int rc = request_irq(iface->irq, bfin_twi_interrupt_entry,
>- 0, pdev->name, iface);
>+ 0, to_platform_device(dev)->name, iface);
> if (rc) {
>- dev_err(&pdev->dev, "Can't get IRQ %d !\n", iface->irq);
>+ dev_err(dev, "Can't get IRQ %d !\n", iface->irq);
> return -ENODEV;
> }
>
>@@ -646,6 +646,9 @@ static int i2c_bfin_twi_resume(struct pl
> return 0;
> }
>
>+static SIMPLE_DEV_PM_OPS(i2c_bfin_twi_pm,
>+ i2c_bfin_twi_suspend, i2c_bfin_twi_resume);
>+
> static int i2c_bfin_twi_probe(struct platform_device *pdev)
> {
> struct bfin_twi_iface *iface;
>@@ -770,11 +773,10 @@ static int i2c_bfin_twi_remove(struct pl
> static struct platform_driver i2c_bfin_twi_driver = {
> .probe = i2c_bfin_twi_probe,
> .remove = i2c_bfin_twi_remove,
>- .suspend = i2c_bfin_twi_suspend,
>- .resume = i2c_bfin_twi_resume,
> .driver = {
> .name = "i2c-bfin-twi",
> .owner = THIS_MODULE,
>+ .pm = &i2c_bfin_twi_pm,
> },
> };
>
>
^ permalink raw reply [flat|nested] 14+ messages in thread
* [PATCH 3/7] i2c-ocores: Use struct dev_pm_ops for power management
2012-07-11 19:21 [PATCH 0/7] PM / I2C: Convert platform I2C drivers to PM handling based on struct dev_pm_ops Rafael J. Wysocki
2012-07-11 19:22 ` [PATCH 1/7] i2c-at91: Use struct dev_pm_ops for power management Rafael J. Wysocki
2012-07-11 19:23 ` [PATCH 2/7] i2c-bfin-twi: " Rafael J. Wysocki
@ 2012-07-11 19:24 ` Rafael J. Wysocki
[not found] ` <201207112121.11046.rjw-KKrjLPT3xs0@public.gmane.org>
` (4 subsequent siblings)
7 siblings, 0 replies; 14+ messages in thread
From: Rafael J. Wysocki @ 2012-07-11 19:24 UTC (permalink / raw)
To: LKML
Cc: Linux PM list, Linus Walleij, linux-i2c, Sonic Zhang,
Jean Delvare, Ben Dooks, Wolfram Sang, Peter Korsgaard,
Guan Xuetao, Vitaly Wool, Colin Cross, Stephen Warren
From: Rafael J. Wysocki <rjw@sisk.pl>
Make the OpenCores I2C controller driver define its PM callbacks
through a struct dev_pm_ops object rather than by using legacy PM
hooks in struct platform_driver.
Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
---
drivers/i2c/busses/i2c-ocores.c | 17 +++++++++--------
1 file changed, 9 insertions(+), 8 deletions(-)
Index: linux/drivers/i2c/busses/i2c-ocores.c
===================================================================
--- linux.orig/drivers/i2c/busses/i2c-ocores.c
+++ linux/drivers/i2c/busses/i2c-ocores.c
@@ -367,9 +367,9 @@ static int __devexit ocores_i2c_remove(s
}
#ifdef CONFIG_PM
-static int ocores_i2c_suspend(struct platform_device *pdev, pm_message_t state)
+static int ocores_i2c_suspend(struct device *dev)
{
- struct ocores_i2c *i2c = platform_get_drvdata(pdev);
+ struct ocores_i2c *i2c = dev_get_drvdata(dev);
u8 ctrl = oc_getreg(i2c, OCI2C_CONTROL);
/* make sure the device is disabled */
@@ -378,17 +378,19 @@ static int ocores_i2c_suspend(struct pla
return 0;
}
-static int ocores_i2c_resume(struct platform_device *pdev)
+static int ocores_i2c_resume(struct device *dev)
{
- struct ocores_i2c *i2c = platform_get_drvdata(pdev);
+ struct ocores_i2c *i2c = dev_get_drvdata(dev);
ocores_init(i2c);
return 0;
}
+
+static SIMPLE_DEV_PM_OPS(ocores_i2c_pm, ocores_i2c_suspend, ocores_i2c_resume);
+#define OCORES_I2C_PM (&ocores_i2c_pm)
#else
-#define ocores_i2c_suspend NULL
-#define ocores_i2c_resume NULL
+#define OCORES_I2C_PM NULL
#endif
static struct of_device_id ocores_i2c_match[] = {
@@ -400,12 +402,11 @@ MODULE_DEVICE_TABLE(of, ocores_i2c_match
static struct platform_driver ocores_i2c_driver = {
.probe = ocores_i2c_probe,
.remove = __devexit_p(ocores_i2c_remove),
- .suspend = ocores_i2c_suspend,
- .resume = ocores_i2c_resume,
.driver = {
.owner = THIS_MODULE,
.name = "ocores-i2c",
.of_match_table = ocores_i2c_match,
+ .pm = OCORES_I2C_PM,
},
};
^ permalink raw reply [flat|nested] 14+ messages in thread[parent not found: <201207112121.11046.rjw-KKrjLPT3xs0@public.gmane.org>]
* [PATCH 4/7] i2c-pnx: Use struct dev_pm_ops for power management
[not found] ` <201207112121.11046.rjw-KKrjLPT3xs0@public.gmane.org>
@ 2012-07-11 19:25 ` Rafael J. Wysocki
2012-07-12 6:00 ` [PATCH 0/7] PM / I2C: Convert platform I2C drivers to PM handling based on struct dev_pm_ops Laxman Dewangan
1 sibling, 0 replies; 14+ messages in thread
From: Rafael J. Wysocki @ 2012-07-11 19:25 UTC (permalink / raw)
To: LKML
Cc: Linux PM list, Linus Walleij, linux-i2c-u79uwXL29TY76Z2rM5mHXA,
Sonic Zhang, Jean Delvare, Ben Dooks, Wolfram Sang,
Peter Korsgaard, Guan Xuetao, Vitaly Wool, Colin Cross,
Stephen Warren
From: Rafael J. Wysocki <rjw-KKrjLPT3xs0@public.gmane.org>
Make the PNX I2C controller driver define its PM callbacks through
a struct dev_pm_ops object rather than by using legacy PM hooks
in struct platform_driver.
Signed-off-by: Rafael J. Wysocki <rjw-KKrjLPT3xs0@public.gmane.org>
---
drivers/i2c/busses/i2c-pnx.c | 19 ++++++++++---------
1 file changed, 10 insertions(+), 9 deletions(-)
Index: linux/drivers/i2c/busses/i2c-pnx.c
===================================================================
--- linux.orig/drivers/i2c/busses/i2c-pnx.c
+++ linux/drivers/i2c/busses/i2c-pnx.c
@@ -587,25 +587,27 @@ static struct i2c_algorithm pnx_algorith
};
#ifdef CONFIG_PM
-static int i2c_pnx_controller_suspend(struct platform_device *pdev,
- pm_message_t state)
+static int i2c_pnx_controller_suspend(struct device *dev)
{
- struct i2c_pnx_algo_data *alg_data = platform_get_drvdata(pdev);
+ struct i2c_pnx_algo_data *alg_data = dev_get_drvdata(dev);
clk_disable(alg_data->clk);
return 0;
}
-static int i2c_pnx_controller_resume(struct platform_device *pdev)
+static int i2c_pnx_controller_resume(struct device *dev)
{
- struct i2c_pnx_algo_data *alg_data = platform_get_drvdata(pdev);
+ struct i2c_pnx_algo_data *alg_data = dev_get_drvdata(dev);
return clk_enable(alg_data->clk);
}
+
+static SIMPLE_DEV_PM_OPS(i2c_pnx_pm,
+ i2c_pnx_controller_suspend, i2c_pnx_controller_resume);
+#define PNX_I2C_PM (&i2c_pnx_pm)
#else
-#define i2c_pnx_controller_suspend NULL
-#define i2c_pnx_controller_resume NULL
+#define PNX_I2C_PM NULL
#endif
static int __devinit i2c_pnx_probe(struct platform_device *pdev)
@@ -783,11 +785,10 @@ static struct platform_driver i2c_pnx_dr
.name = "pnx-i2c",
.owner = THIS_MODULE,
.of_match_table = of_match_ptr(i2c_pnx_of_match),
+ .pm = PNX_I2C_PM,
},
.probe = i2c_pnx_probe,
.remove = __devexit_p(i2c_pnx_remove),
- .suspend = i2c_pnx_controller_suspend,
- .resume = i2c_pnx_controller_resume,
};
static int __init i2c_adap_pnx_init(void)
^ permalink raw reply [flat|nested] 14+ messages in thread* Re: [PATCH 0/7] PM / I2C: Convert platform I2C drivers to PM handling based on struct dev_pm_ops
[not found] ` <201207112121.11046.rjw-KKrjLPT3xs0@public.gmane.org>
2012-07-11 19:25 ` [PATCH 4/7] i2c-pnx: " Rafael J. Wysocki
@ 2012-07-12 6:00 ` Laxman Dewangan
1 sibling, 0 replies; 14+ messages in thread
From: Laxman Dewangan @ 2012-07-12 6:00 UTC (permalink / raw)
To: Rafael J. Wysocki
Cc: LKML, Linux PM list, Linus Walleij,
linux-i2c-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, Sonic Zhang,
Jean Delvare, Ben Dooks, Wolfram Sang, Peter Korsgaard,
Guan Xuetao, Vitaly Wool, Colin Cross, Stephen Warren
On Thursday 12 July 2012 12:51 AM, Rafael J. Wysocki wrote:
> [7/7] i2c-tegra: Use struct dev_pm_ops for power management
>
I did not get the 7/7 on my inbox and hence responding here.
Looked change from link
https://lkml.org/lkml/2012/7/11/467
This is same as which I sent some days ago:
https://lkml.org/lkml/2012/7/10/275
I am fine with the change:
Acked-by: Laxman Dewangan <ldewangan-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>
^ permalink raw reply [flat|nested] 14+ messages in thread
* [PATCH 5/7] i2c-puv3: Use struct dev_pm_ops for power management
2012-07-11 19:21 [PATCH 0/7] PM / I2C: Convert platform I2C drivers to PM handling based on struct dev_pm_ops Rafael J. Wysocki
` (3 preceding siblings ...)
[not found] ` <201207112121.11046.rjw-KKrjLPT3xs0@public.gmane.org>
@ 2012-07-11 19:25 ` Rafael J. Wysocki
2012-07-12 3:24 ` guanxuetao
2012-07-11 19:26 ` [PATCH 6/7] i2c-stu300: " Rafael J. Wysocki
` (2 subsequent siblings)
7 siblings, 1 reply; 14+ messages in thread
From: Rafael J. Wysocki @ 2012-07-11 19:25 UTC (permalink / raw)
To: LKML
Cc: Linux PM list, Linus Walleij, linux-i2c, Sonic Zhang,
Jean Delvare, Ben Dooks, Wolfram Sang, Peter Korsgaard,
Guan Xuetao, Vitaly Wool, Colin Cross, Stephen Warren
From: Rafael J. Wysocki <rjw@sisk.pl>
Make the PKUnity-v3 SoC I2C controller driver define its suspend
callback through a struct dev_pm_ops object rather than by using
a legacy PM hook in struct platform_driver. The empty resume
callback is not necessary, so remove it.
Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
---
drivers/i2c/busses/i2c-puv3.c | 15 ++++++---------
1 file changed, 6 insertions(+), 9 deletions(-)
Index: linux/drivers/i2c/busses/i2c-puv3.c
===================================================================
--- linux.orig/drivers/i2c/busses/i2c-puv3.c
+++ linux/drivers/i2c/busses/i2c-puv3.c
@@ -254,7 +254,7 @@ static int __devexit puv3_i2c_remove(str
}
#ifdef CONFIG_PM
-static int puv3_i2c_suspend(struct platform_device *dev, pm_message_t state)
+static int puv3_i2c_suspend(struct device *dev)
{
int poll_count;
/* Disable the IIC */
@@ -267,23 +267,20 @@ static int puv3_i2c_suspend(struct platf
return 0;
}
-static int puv3_i2c_resume(struct platform_device *dev)
-{
- return 0 ;
-}
+static SIMPLE_DEV_PM_OPS(puv3_i2c_pm, puv3_i2c_suspend, NULL);
+#define PUV3_I2C_PM (&puv3_i2c_pm)
+
#else
-#define puv3_i2c_suspend NULL
-#define puv3_i2c_resume NULL
+#define PUV3_I2C_PM NULL
#endif
static struct platform_driver puv3_i2c_driver = {
.probe = puv3_i2c_probe,
.remove = __devexit_p(puv3_i2c_remove),
- .suspend = puv3_i2c_suspend,
- .resume = puv3_i2c_resume,
.driver = {
.name = "PKUnity-v3-I2C",
.owner = THIS_MODULE,
+ .pm = PUV3_I2C_PM,
}
};
^ permalink raw reply [flat|nested] 14+ messages in thread* Re: [PATCH 5/7] i2c-puv3: Use struct dev_pm_ops for power management
2012-07-11 19:25 ` [PATCH 5/7] i2c-puv3: Use struct dev_pm_ops for power management Rafael J. Wysocki
@ 2012-07-12 3:24 ` guanxuetao
0 siblings, 0 replies; 14+ messages in thread
From: guanxuetao @ 2012-07-12 3:24 UTC (permalink / raw)
To: Rafael J. Wysocki
Cc: LKML, Linux PM list, Linus Walleij, linux-i2c, Sonic Zhang,
Jean Delvare, Ben Dooks, Wolfram Sang, Peter Korsgaard,
Guan Xuetao, Vitaly Wool, Colin Cross, Stephen Warren
> From: Rafael J. Wysocki <rjw@sisk.pl>
>
> Make the PKUnity-v3 SoC I2C controller driver define its suspend
> callback through a struct dev_pm_ops object rather than by using
> a legacy PM hook in struct platform_driver. The empty resume
> callback is not necessary, so remove it.
>
> Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
Thanks.
Acked-by: Guan Xuetao <gxt@mprc.pku.edu.cn>
> ---
> drivers/i2c/busses/i2c-puv3.c | 15 ++++++---------
> 1 file changed, 6 insertions(+), 9 deletions(-)
>
> Index: linux/drivers/i2c/busses/i2c-puv3.c
> ===================================================================
> --- linux.orig/drivers/i2c/busses/i2c-puv3.c
> +++ linux/drivers/i2c/busses/i2c-puv3.c
> @@ -254,7 +254,7 @@ static int __devexit puv3_i2c_remove(str
> }
>
> #ifdef CONFIG_PM
> -static int puv3_i2c_suspend(struct platform_device *dev, pm_message_t
> state)
> +static int puv3_i2c_suspend(struct device *dev)
> {
> int poll_count;
> /* Disable the IIC */
> @@ -267,23 +267,20 @@ static int puv3_i2c_suspend(struct platf
> return 0;
> }
>
> -static int puv3_i2c_resume(struct platform_device *dev)
> -{
> - return 0 ;
> -}
> +static SIMPLE_DEV_PM_OPS(puv3_i2c_pm, puv3_i2c_suspend, NULL);
> +#define PUV3_I2C_PM (&puv3_i2c_pm)
> +
> #else
> -#define puv3_i2c_suspend NULL
> -#define puv3_i2c_resume NULL
> +#define PUV3_I2C_PM NULL
> #endif
>
> static struct platform_driver puv3_i2c_driver = {
> .probe = puv3_i2c_probe,
> .remove = __devexit_p(puv3_i2c_remove),
> - .suspend = puv3_i2c_suspend,
> - .resume = puv3_i2c_resume,
> .driver = {
> .name = "PKUnity-v3-I2C",
> .owner = THIS_MODULE,
> + .pm = PUV3_I2C_PM,
> }
> };
>
>
^ permalink raw reply [flat|nested] 14+ messages in thread
* [PATCH 6/7] i2c-stu300: Use struct dev_pm_ops for power management
2012-07-11 19:21 [PATCH 0/7] PM / I2C: Convert platform I2C drivers to PM handling based on struct dev_pm_ops Rafael J. Wysocki
` (4 preceding siblings ...)
2012-07-11 19:25 ` [PATCH 5/7] i2c-puv3: Use struct dev_pm_ops for power management Rafael J. Wysocki
@ 2012-07-11 19:26 ` Rafael J. Wysocki
[not found] ` <201207112126.36412.rjw-KKrjLPT3xs0@public.gmane.org>
2012-07-11 19:27 ` [PATCH 7/7] i2c-tegra: " Rafael J. Wysocki
2012-07-12 10:09 ` [PATCH 0/7] PM / I2C: Convert platform I2C drivers to PM handling based on struct dev_pm_ops Wolfram Sang
7 siblings, 1 reply; 14+ messages in thread
From: Rafael J. Wysocki @ 2012-07-11 19:26 UTC (permalink / raw)
To: LKML
Cc: Linux PM list, Linus Walleij, linux-i2c, Sonic Zhang,
Jean Delvare, Ben Dooks, Wolfram Sang, Peter Korsgaard,
Guan Xuetao, Vitaly Wool, Colin Cross, Stephen Warren
From: Rafael J. Wysocki <rjw@sisk.pl>
Make the ST-Ericsson U300 I2C controller driver define its PM
callbacks through a struct dev_pm_ops object rather than by using
legacy PM hooks in struct platform_driver.
Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
---
drivers/i2c/busses/i2c-stu300.c | 19 ++++++++++---------
1 file changed, 10 insertions(+), 9 deletions(-)
Index: linux/drivers/i2c/busses/i2c-stu300.c
===================================================================
--- linux.orig/drivers/i2c/busses/i2c-stu300.c
+++ linux/drivers/i2c/busses/i2c-stu300.c
@@ -978,31 +978,33 @@ stu300_probe(struct platform_device *pde
}
#ifdef CONFIG_PM
-static int stu300_suspend(struct platform_device *pdev, pm_message_t state)
+static int stu300_suspend(struct device *device)
{
- struct stu300_dev *dev = platform_get_drvdata(pdev);
+ struct stu300_dev *dev = dev_get_drvdata(device);
/* Turn off everything */
stu300_wr8(0x00, dev->virtbase + I2C_CR);
return 0;
}
-static int stu300_resume(struct platform_device *pdev)
+static int stu300_resume(struct device *device)
{
int ret = 0;
- struct stu300_dev *dev = platform_get_drvdata(pdev);
+ struct stu300_dev *dev = dev_get_drvdata(device);
clk_enable(dev->clk);
ret = stu300_init_hw(dev);
clk_disable(dev->clk);
if (ret != 0)
- dev_err(&pdev->dev, "error re-initializing hardware.\n");
+ dev_err(device, "error re-initializing hardware.\n");
return ret;
}
+
+static SIMPLE_DEV_PM_OPS(stu300_pm, stu300_suspend, stu300_resume);
+#define STU300_I2C_PM (&stu300_pm)
#else
-#define stu300_suspend NULL
-#define stu300_resume NULL
+#define STU300_I2C_PM NULL
#endif
static int __exit
@@ -1026,10 +1028,9 @@ static struct platform_driver stu300_i2c
.driver = {
.name = NAME,
.owner = THIS_MODULE,
+ .pm = STU300_I2C_PM,
},
.remove = __exit_p(stu300_remove),
- .suspend = stu300_suspend,
- .resume = stu300_resume,
};
^ permalink raw reply [flat|nested] 14+ messages in thread* [PATCH 7/7] i2c-tegra: Use struct dev_pm_ops for power management
2012-07-11 19:21 [PATCH 0/7] PM / I2C: Convert platform I2C drivers to PM handling based on struct dev_pm_ops Rafael J. Wysocki
` (5 preceding siblings ...)
2012-07-11 19:26 ` [PATCH 6/7] i2c-stu300: " Rafael J. Wysocki
@ 2012-07-11 19:27 ` Rafael J. Wysocki
2012-07-12 10:09 ` [PATCH 0/7] PM / I2C: Convert platform I2C drivers to PM handling based on struct dev_pm_ops Wolfram Sang
7 siblings, 0 replies; 14+ messages in thread
From: Rafael J. Wysocki @ 2012-07-11 19:27 UTC (permalink / raw)
To: LKML
Cc: Linux PM list, Linus Walleij, linux-i2c, Sonic Zhang,
Jean Delvare, Ben Dooks, Wolfram Sang, Peter Korsgaard,
Guan Xuetao, Vitaly Wool, Colin Cross, Stephen Warren
From: Rafael J. Wysocki <rjw@sisk.pl>
Make the Tegra I2C controller driver define its PM callbacks through
a struct dev_pm_ops object rather than by using legacy PM hooks
in struct platform_driver.
Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
---
drivers/i2c/busses/i2c-tegra.c | 18 ++++++++++--------
1 file changed, 10 insertions(+), 8 deletions(-)
Index: linux/drivers/i2c/busses/i2c-tegra.c
===================================================================
--- linux.orig/drivers/i2c/busses/i2c-tegra.c
+++ linux/drivers/i2c/busses/i2c-tegra.c
@@ -717,9 +717,9 @@ static int __devexit tegra_i2c_remove(st
}
#ifdef CONFIG_PM
-static int tegra_i2c_suspend(struct platform_device *pdev, pm_message_t state)
+static int tegra_i2c_suspend(struct device *dev)
{
- struct tegra_i2c_dev *i2c_dev = platform_get_drvdata(pdev);
+ struct tegra_i2c_dev *i2c_dev = dev_get_drvdata(dev);
i2c_lock_adapter(&i2c_dev->adapter);
i2c_dev->is_suspended = true;
@@ -728,9 +728,9 @@ static int tegra_i2c_suspend(struct plat
return 0;
}
-static int tegra_i2c_resume(struct platform_device *pdev)
+static int tegra_i2c_resume(struct device *dev)
{
- struct tegra_i2c_dev *i2c_dev = platform_get_drvdata(pdev);
+ struct tegra_i2c_dev *i2c_dev = dev_get_drvdata(dev);
int ret;
i2c_lock_adapter(&i2c_dev->adapter);
@@ -748,6 +748,11 @@ static int tegra_i2c_resume(struct platf
return 0;
}
+
+static SIMPLE_DEV_PM_OPS(tegra_i2c_pm, tegra_i2c_suspend, tegra_i2c_resume);
+#define TEGRA_I2C_PM (&tegra_i2c_pm)
+#else
+#define TEGRA_I2C_PM NULL
#endif
#if defined(CONFIG_OF)
@@ -765,14 +770,11 @@ MODULE_DEVICE_TABLE(of, tegra_i2c_of_mat
static struct platform_driver tegra_i2c_driver = {
.probe = tegra_i2c_probe,
.remove = __devexit_p(tegra_i2c_remove),
-#ifdef CONFIG_PM
- .suspend = tegra_i2c_suspend,
- .resume = tegra_i2c_resume,
-#endif
.driver = {
.name = "tegra-i2c",
.owner = THIS_MODULE,
.of_match_table = tegra_i2c_of_match,
+ .pm = TEGRA_I2C_PM,
},
};
^ permalink raw reply [flat|nested] 14+ messages in thread* Re: [PATCH 0/7] PM / I2C: Convert platform I2C drivers to PM handling based on struct dev_pm_ops
2012-07-11 19:21 [PATCH 0/7] PM / I2C: Convert platform I2C drivers to PM handling based on struct dev_pm_ops Rafael J. Wysocki
` (6 preceding siblings ...)
2012-07-11 19:27 ` [PATCH 7/7] i2c-tegra: " Rafael J. Wysocki
@ 2012-07-12 10:09 ` Wolfram Sang
2012-07-12 10:17 ` Rafael J. Wysocki
7 siblings, 1 reply; 14+ messages in thread
From: Wolfram Sang @ 2012-07-12 10:09 UTC (permalink / raw)
To: Rafael J. Wysocki
Cc: LKML, Linux PM list, Linus Walleij, linux-i2c, Sonic Zhang,
Jean Delvare, Ben Dooks, Peter Korsgaard, Guan Xuetao,
Vitaly Wool, Colin Cross, Stephen Warren
[-- Attachment #1: Type: text/plain, Size: 1287 bytes --]
On Wed, Jul 11, 2012 at 09:21:10PM +0200, Rafael J. Wysocki wrote:
> Hi all,
>
> As per
>
> http://marc.info/?l=linux-kernel&m=133996733422413&w=4
>
> the following patches convert some platform I2C controller drivers to the PM
> handling based on struct dev_pm_ops:
>
> [1/7] i2c-at91: Use struct dev_pm_ops for power management
> [2/7] i2c-bfin-twi: Use struct dev_pm_ops for power management
> [3/7] i2c-ocores: Use struct dev_pm_ops for power management
> [4/7] i2c-pnx: Use struct dev_pm_ops for power management
> [5/7] i2c-puv3: Use struct dev_pm_ops for power management
> [6/7] i2c-stu300: Use struct dev_pm_ops for power management
> [7/7] i2c-tegra: Use struct dev_pm_ops for power management
>
> I'd like to include them into my PM pull request for 3.6 if there are no
> objections.
The changes are fine by me. I'd like to pull them in via I2C, though,
since they are changing mostly drivers for which I have other patches in
the pile and I'd like to see the conflicts myself. Is that okay? They'd
be in linux-next tomorrow. Or is there a dependency I missed?
Thanks,
Wolfram
--
Pengutronix e.K. | Wolfram Sang |
Industrial Linux Solutions | http://www.pengutronix.de/ |
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 198 bytes --]
^ permalink raw reply [flat|nested] 14+ messages in thread* Re: [PATCH 0/7] PM / I2C: Convert platform I2C drivers to PM handling based on struct dev_pm_ops
2012-07-12 10:09 ` [PATCH 0/7] PM / I2C: Convert platform I2C drivers to PM handling based on struct dev_pm_ops Wolfram Sang
@ 2012-07-12 10:17 ` Rafael J. Wysocki
0 siblings, 0 replies; 14+ messages in thread
From: Rafael J. Wysocki @ 2012-07-12 10:17 UTC (permalink / raw)
To: Wolfram Sang
Cc: LKML, Linux PM list, Linus Walleij, linux-i2c, Sonic Zhang,
Jean Delvare, Ben Dooks, Peter Korsgaard, Guan Xuetao,
Vitaly Wool, Colin Cross, Stephen Warren
On Thursday, July 12, 2012, Wolfram Sang wrote:
> On Wed, Jul 11, 2012 at 09:21:10PM +0200, Rafael J. Wysocki wrote:
> > Hi all,
> >
> > As per
> >
> > http://marc.info/?l=linux-kernel&m=133996733422413&w=4
> >
> > the following patches convert some platform I2C controller drivers to the PM
> > handling based on struct dev_pm_ops:
> >
> > [1/7] i2c-at91: Use struct dev_pm_ops for power management
> > [2/7] i2c-bfin-twi: Use struct dev_pm_ops for power management
> > [3/7] i2c-ocores: Use struct dev_pm_ops for power management
> > [4/7] i2c-pnx: Use struct dev_pm_ops for power management
> > [5/7] i2c-puv3: Use struct dev_pm_ops for power management
> > [6/7] i2c-stu300: Use struct dev_pm_ops for power management
> > [7/7] i2c-tegra: Use struct dev_pm_ops for power management
> >
> > I'd like to include them into my PM pull request for 3.6 if there are no
> > objections.
>
> The changes are fine by me. I'd like to pull them in via I2C, though,
> since they are changing mostly drivers for which I have other patches in
> the pile and I'd like to see the conflicts myself. Is that okay? They'd
> be in linux-next tomorrow.
Cool, thanks for handling them! :-)
> Or is there a dependency I missed?
No, there shouldn't be any.
Thanks,
Rafael
^ permalink raw reply [flat|nested] 14+ messages in thread