w1_gpio: switch to new dev_pm_ops
PATCH 2/2 w1_gpio: switch to new dev_pm_ops
Signed-off-by Daniel Mack <[email protected]>
Cc Ville Syrjala <[email protected]>
Cc Evgeniy Polyakov <[email protected]>
--- drivers/w1/masters/w1-gpio.c | 21 +++++++++++++-------- 1 files changed, 13 insertions(+), 8 deletions(-)
drivers/w1/masters/w1-gpio.c +13 -8
@@ -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 )
Signature · 1 line
1.6.3.3
Quoted 12 lines · Daniel Mack
Signed-off-by Daniel Mack <[email protected]>Cc Ville Syrjala <[email protected]>Cc Evgeniy Polyakov <[email protected]>--- drivers/w1/masters/w1-gpio.c | 21 +++++++++++++-------- 1 files changed, 13 insertions(+), 8 deletions(-)drivers/w1/masters/w1-gpio.c +0
-0
drivers/w1/masters/w1-gpio.c static int __exit w1_gpio_remove(struct platform_device *pdev) · line 111
Quoted 8 lines
drivers/w1/masters/w1-gpio.c +2
-2@@ -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
Quoted 6 lines · Daniel Mack
Signed-off-by Daniel Mack <[email protected]>Cc Ville Syrjala <[email protected]>Cc Evgeniy Polyakov <[email protected]>--- drivers/w1/masters/w1-gpio.c | 21 +++++++++++++-------- 1 files changed, 13 insertions(+), 8 deletions(-)
New version below.
Daniel
Quoted 1 line
From
b7d5b54ccb130a77b2b99c950465dbbc1099504bMon Sep 17 00:00:00 2001
From: Daniel Mack <[email protected]>
Date: Wed, 5 Aug 2009 14:43:31 +0200
Subject: [PATCH] w1_gpio: switch to new dev_pm_ops
Signed-off-by Daniel Mack <[email protected]>
Cc Ville Syrjala <[email protected]>
Cc Evgeniy Polyakov <[email protected]>
--- drivers/w1/masters/w1-gpio.c | 21 +++++++++++++-------- 1 files changed, 13 insertions(+), 8 deletions(-)
drivers/w1/masters/w1-gpio.c +13 -8
@@ -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 )
Signature · 1 line
1.6.3.3