gpio: mpc8xxx: switch to using DEFINE_RUNTIME_DEV_PM_OPS()
PATCH v2 1/1 gpio: mpc8xxx: switch to using DEFINE_RUNTIME_DEV_PM_OPS()
From: Bartosz Golaszewski <[email protected]>
Use the preferred API for assigning system sleep pm callbacks in drivers.
Suggested-by Andy Shevchenko <[email protected]>
Signed-off-by Bartosz Golaszewski <[email protected]>
---
v1 -> v2:
- include pm.h too (doesn't hurt)
- use pm_ptr() instead of pm_sleep_ptr()
- improve the line breaks
drivers/gpio/gpio-mpc8xxx.c | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-)
drivers/gpio/gpio-mpc8xxx.c +12 -13
@@ -17,6 +17,8 @@#include <linux/mod_devicetable.h> #include <linux/of.h> #include <linux/platform_device.h> +#include <linux/pm.h> +#include <linux/pm_runtime.h> #include <linux/property.h> #include <linux/slab.h> #include <linux/spinlock.h>
@@ -431,30 +433,28 @@ static void mpc8xxx_remove(struct platform_device *pdev) } } -#ifdef CONFIG_PM -static int mpc8xxx_suspend (struct platform_device *pdev,pm_message_t state) +static int mpc8xxx_suspend (struct device *dev) { -struct mpc8xxx_gpio_chip *mpc8xxx_gc =platform_get_drvdata (pdev); +struct mpc8xxx_gpio_chip *mpc8xxx_gc =dev_get_drvdata (dev); -if (mpc8xxx_gc->irqn &&device_may_wakeup (&pdev->dev)) +if (mpc8xxx_gc->irqn &&device_may_wakeup (dev))enable_irq_wake (mpc8xxx_gc->irqn);return 0 ; } -static int mpc8xxx_resume (struct platform_device *pdev) +static int mpc8xxx_resume (struct device *dev) { -struct mpc8xxx_gpio_chip *mpc8xxx_gc =platform_get_drvdata (pdev); +struct mpc8xxx_gpio_chip *mpc8xxx_gc =dev_get_drvdata (dev); -if (mpc8xxx_gc->irqn &&device_may_wakeup (&pdev->dev)) +if (mpc8xxx_gc->irqn &&device_may_wakeup (dev))disable_irq_wake (mpc8xxx_gc->irqn);return 0 ; } -#else -#define mpc8xxx_suspend NULL -#define mpc8xxx_resume NULL -#endif + +static DEFINE_RUNTIME_DEV_PM_OPS(mpc8xx_pm_ops, + mpc8xxx_suspend, mpc8xxx_resume, NULL);#ifdef CONFIG_ACPI static const struct acpi_device_id gpio_acpi_ids[] = {
@@ -467,12 +467,11 @@ MODULE_DEVICE_TABLE(acpi, gpio_acpi_ids);static struct platform_driver mpc8xxx_plat_driver = { .probe = mpc8xxx_probe, .remove_new = mpc8xxx_remove, - .suspend = mpc8xxx_suspend, - .resume = mpc8xxx_resume, .driver = { .name ="gpio-mpc8xxx" , .of_match_table = mpc8xxx_gpio_ids, .acpi_match_table =ACPI_PTR (gpio_acpi_ids), + .pm =pm_ptr (&mpc8xx_pm_ops), }, };
Signature · 1 line
2.43.0
Quoted 3 lines · Bartosz Golaszewski
From: Bartosz Golaszewski <[email protected]>
Use the preferred API for assigning system sleep pm callbacks in drivers.
Reviewed-by Andy Shevchenko <[email protected]>
(and please correct Suggested-by email when applying, thanks!)
Signature · 2 lines
With Best Regards, Andy Shevchenko
Bartosz Golaszewski
AppliedFrom: Bartosz Golaszewski <[email protected]>
Quoted 3 lines · Bartosz Golaszewski
Use the preferred API for assigning system sleep pm callbacks in drivers.
Applied, thanks!
[1/1] gpio: mpc8xxx: switch to using DEFINE_RUNTIME_DEV_PM_OPS()
commit: 6b5e97c020060c2b8ad286002415106ab7034435
Best regards,
Signature · 1 line
Bartosz Golaszewski <[email protected]>