W1: w1-gpio - switch to using dev_pm_ops
PATCH 1/1 W1: w1-gpio - switch to using dev_pm_ops
Let's stop using legacy platform driver hooks for power management and switch to using the standard dev_pm_ops-based hooks.
Also, instead of guarding PM methods with #ifdef CONFIG_PM annotate them as __maybe_unused as it provides better compile coverage.
Signed-off-by Dmitry Torokhov <[email protected]>
---
Private patch queue cleaning. I am sure I already sent this one 2 or 3 years ago...
drivers/w1/masters/w1-gpio.c | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-)
drivers/w1/masters/w1-gpio.c +7 -13
@@ -198,11 +198,9 @@ static int w1_gpio_remove(struct platform_device *pdev)return 0 ; } -#ifdef CONFIG_PM - -static int w1_gpio_suspend (struct platform_device *pdev,pm_message_t state) +static int __maybe_unused w1_gpio_suspend (struct device *dev) { -struct w1_gpio_platform_data *pdata =dev_get_platdata (&pdev->dev); +struct w1_gpio_platform_data *pdata =dev_get_platdata (dev);if (pdata->enable_external_pullup) pdata->enable_external_pullup (0 );
@@ -210,9 +208,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 __maybe_unused w1_gpio_resume (struct device *dev) { -struct w1_gpio_platform_data *pdata =dev_get_platdata (&pdev->dev); +struct w1_gpio_platform_data *pdata =dev_get_platdata (dev);if (pdata->enable_external_pullup) pdata->enable_external_pullup (1 );
@@ -220,20 +218,16 @@ static int w1_gpio_resume(struct platform_device *pdev)return 0 ; } -#else -#define w1_gpio_suspend NULL -#define w1_gpio_resume NULL -#endif +static SIMPLE_DEV_PM_OPS(w1_gpio_pm_ops, w1_gpio_suspend, w1_gpio_resume);static struct platform_driver w1_gpio_driver = { .driver = { .name ="w1-gpio" , + .pm = &w1_gpio_pm_ops, .of_match_table =of_match_ptr (w1_gpio_dt_ids), }, .probe = w1_gpio_probe, - .remove = w1_gpio_remove, - .suspend = w1_gpio_suspend, - .resume = w1_gpio_resume, + .remove = w1_gpio_remove, };module_platform_driver (w1_gpio_driver);
Signature · 5 lines
2.6.0.rc2.230.g3dd15c0 -- Dmitry