* [PATCH 2/2] w1_gpio: switch to new dev_pm_ops
@ 2009-08-05 12:46 Daniel Mack
2009-08-05 13:45 ` Daniel Mack
2009-08-05 13:55 ` Daniel Mack
0 siblings, 2 replies; 3+ messages in thread
From: Daniel Mack @ 2009-08-05 12:46 UTC (permalink / raw)
To: linux-kernel; +Cc: Daniel Mack, Ville Syrjala, Evgeniy Polyakov
Signed-off-by: Daniel Mack <daniel@caiaq.de>
Cc: Ville Syrjala <syrjala@sci.fi>
Cc: Evgeniy Polyakov <johnpol@2ka.mipt.ru>
---
drivers/w1/masters/w1-gpio.c | 21 +++++++++++++--------
1 files changed, 13 insertions(+), 8 deletions(-)
diff --git a/drivers/w1/masters/w1-gpio.c b/drivers/w1/masters/w1-gpio.c
index 6f8866d..4a940fb 100644
--- a/drivers/w1/masters/w1-gpio.c
+++ b/drivers/w1/masters/w1-gpio.c
@@ -106,9 +106,9 @@ static int __exit w1_gpio_remove(struct platform_device *pdev)
#ifdef CONFIG_PM
-static int w1_gpio_suspend(struct platform_device *pdev, pm_message_t state)
+static int w1_gpio_suspend(struct device *dev)
{
- struct w1_gpio_platform_data *pdata = pdev->dev.platform_data;
+ struct w1_gpio_platform_data *pdata = dev_get_drvdata(dev);
if (pdata->enable_external_pullup)
pdata->enable_external_pullup(0);
@@ -116,9 +116,9 @@ static int w1_gpio_suspend(struct platform_device *pdev, pm_message_t state)
return 0;
}
-static int w1_gpio_resume(struct platform_device *pdev)
+static int w1_gpio_resume(struct device *dev)
{
- struct w1_gpio_platform_data *pdata = pdev->dev.platform_data;
+ struct w1_gpio_platform_data *pdata = dev_get_drvdata(dev);
if (pdata->enable_external_pullup)
pdata->enable_external_pullup(1);
@@ -126,19 +126,24 @@ static int w1_gpio_resume(struct platform_device *pdev)
return 0;
}
+static struct dev_pm_ops w1_gpio_pm_ops = {
+ .suspend = w1_gpio_suspend,
+ .resume = w1_gpio_resume,
+};
+
+#define W1_GPIO_PM_OPS (&w1_gpio_pm_ops)
+
#else
-#define w1_gpio_suspend NULL
-#define w1_gpio_resume NULL
+#define W1_GPIO_PM_OPS NULL
#endif
static struct platform_driver w1_gpio_driver = {
.driver = {
.name = "w1-gpio",
.owner = THIS_MODULE,
+ .pm = W1_GPIO_PM_OPS,
},
.remove = __exit_p(w1_gpio_remove),
- .suspend = w1_gpio_suspend,
- .resume = w1_gpio_resume,
};
static int __init w1_gpio_init(void)
--
1.6.3.3
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH 2/2] w1_gpio: switch to new dev_pm_ops
2009-08-05 12:46 [PATCH 2/2] w1_gpio: switch to new dev_pm_ops Daniel Mack
@ 2009-08-05 13:45 ` Daniel Mack
2009-08-05 13:55 ` Daniel Mack
1 sibling, 0 replies; 3+ messages in thread
From: Daniel Mack @ 2009-08-05 13:45 UTC (permalink / raw)
To: linux-kernel; +Cc: Ville Syrjala, Evgeniy Polyakov
On Wed, Aug 05, 2009 at 02:46:52PM +0200, Daniel Mack wrote:
> Signed-off-by: Daniel Mack <daniel@caiaq.de>
> Cc: Ville Syrjala <syrjala@sci.fi>
> Cc: Evgeniy Polyakov <johnpol@2ka.mipt.ru>
> ---
> drivers/w1/masters/w1-gpio.c | 21 +++++++++++++--------
> 1 files changed, 13 insertions(+), 8 deletions(-)
>
> diff --git a/drivers/w1/masters/w1-gpio.c b/drivers/w1/masters/w1-gpio.c
> index 6f8866d..4a940fb 100644
> --- a/drivers/w1/masters/w1-gpio.c
> +++ b/drivers/w1/masters/w1-gpio.c
> @@ -106,9 +106,9 @@ static int __exit w1_gpio_remove(struct platform_device *pdev)
>
> #ifdef CONFIG_PM
>
> -static int w1_gpio_suspend(struct platform_device *pdev, pm_message_t state)
> +static int w1_gpio_suspend(struct device *dev)
> {
> - struct w1_gpio_platform_data *pdata = pdev->dev.platform_data;
> + struct w1_gpio_platform_data *pdata = dev_get_drvdata(dev);
That was wrong, I apologize. Will send a new version soon.
Daniel
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH 2/2] w1_gpio: switch to new dev_pm_ops
2009-08-05 12:46 [PATCH 2/2] w1_gpio: switch to new dev_pm_ops Daniel Mack
2009-08-05 13:45 ` Daniel Mack
@ 2009-08-05 13:55 ` Daniel Mack
1 sibling, 0 replies; 3+ messages in thread
From: Daniel Mack @ 2009-08-05 13:55 UTC (permalink / raw)
To: linux-kernel; +Cc: Ville Syrjala, Evgeniy Polyakov
On Wed, Aug 05, 2009 at 02:46:52PM +0200, Daniel Mack wrote:
> Signed-off-by: Daniel Mack <daniel@caiaq.de>
> Cc: Ville Syrjala <syrjala@sci.fi>
> Cc: Evgeniy Polyakov <johnpol@2ka.mipt.ru>
> ---
> drivers/w1/masters/w1-gpio.c | 21 +++++++++++++--------
> 1 files changed, 13 insertions(+), 8 deletions(-)
New version below.
Daniel
>From b7d5b54ccb130a77b2b99c950465dbbc1099504b Mon Sep 17 00:00:00 2001
From: Daniel Mack <daniel@caiaq.de>
Date: Wed, 5 Aug 2009 14:43:31 +0200
Subject: [PATCH] w1_gpio: switch to new dev_pm_ops
Signed-off-by: Daniel Mack <daniel@caiaq.de>
Cc: Ville Syrjala <syrjala@sci.fi>
Cc: Evgeniy Polyakov <johnpol@2ka.mipt.ru>
---
drivers/w1/masters/w1-gpio.c | 21 +++++++++++++--------
1 files changed, 13 insertions(+), 8 deletions(-)
diff --git a/drivers/w1/masters/w1-gpio.c b/drivers/w1/masters/w1-gpio.c
index 6f8866d..6554bd4 100644
--- a/drivers/w1/masters/w1-gpio.c
+++ b/drivers/w1/masters/w1-gpio.c
@@ -106,9 +106,9 @@ static int __exit w1_gpio_remove(struct platform_device *pdev)
#ifdef CONFIG_PM
-static int w1_gpio_suspend(struct platform_device *pdev, pm_message_t state)
+static int w1_gpio_suspend(struct device *dev)
{
- struct w1_gpio_platform_data *pdata = pdev->dev.platform_data;
+ struct w1_gpio_platform_data *pdata = dev->platform_data;
if (pdata->enable_external_pullup)
pdata->enable_external_pullup(0);
@@ -116,9 +116,9 @@ static int w1_gpio_suspend(struct platform_device *pdev, pm_message_t state)
return 0;
}
-static int w1_gpio_resume(struct platform_device *pdev)
+static int w1_gpio_resume(struct device *dev)
{
- struct w1_gpio_platform_data *pdata = pdev->dev.platform_data;
+ struct w1_gpio_platform_data *pdata = dev->platform_data;
if (pdata->enable_external_pullup)
pdata->enable_external_pullup(1);
@@ -126,19 +126,24 @@ static int w1_gpio_resume(struct platform_device *pdev)
return 0;
}
+static struct dev_pm_ops w1_gpio_pm_ops = {
+ .suspend = w1_gpio_suspend,
+ .resume = w1_gpio_resume,
+};
+
+#define W1_GPIO_PM_OPS (&w1_gpio_pm_ops)
+
#else
-#define w1_gpio_suspend NULL
-#define w1_gpio_resume NULL
+#define W1_GPIO_PM_OPS NULL
#endif
static struct platform_driver w1_gpio_driver = {
.driver = {
.name = "w1-gpio",
.owner = THIS_MODULE,
+ .pm = W1_GPIO_PM_OPS,
},
.remove = __exit_p(w1_gpio_remove),
- .suspend = w1_gpio_suspend,
- .resume = w1_gpio_resume,
};
static int __init w1_gpio_init(void)
--
1.6.3.3
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2009-08-05 13:55 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-08-05 12:46 [PATCH 2/2] w1_gpio: switch to new dev_pm_ops Daniel Mack
2009-08-05 13:45 ` Daniel Mack
2009-08-05 13:55 ` Daniel Mack
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox