kevin/linux
1
Fork 0
Code

gpio: mpc8xxx: switch to using DEFINE_RUNTIME_DEV_PM_OPS()

Browse Source 
Use the preferred API for assigning system sleep pm callbacks in drivers.

Suggested-by: Andy Shevchenko <andriy.shevchenko@intel.com>
Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Link: https://lore.kernel.org/r/20240904140706.70359-1-brgl@bgdev.pl
Signed-off-by: Bartosz Golaszewski <bartosz.golaszewski@linaro.org>
This commit is contained in:
Bartosz Golaszewski 2024-09-04 16:07:06 +02:00
parent 4e26ddab82
commit 6b5e97c020
1 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
drivers/gpio/gpio-mpc8xxx.c
View File

@ -17,6 +17,8 @@
#include <linux/mod_devicetable.h> #include <linux/mod_devicetable.h>
#include <linux/of.h> #include <linux/of.h>
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include <linux/pm.h>
#include <linux/pm_runtime.h>
#include <linux/property.h> #include <linux/property.h>
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/spinlock.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 device *dev)
static int mpc8xxx_suspend(struct platform_device *pdev, pm_message_t state)
{ {
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); enable_irq_wake(mpc8xxx_gc->irqn);
return 0; 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); disable_irq_wake(mpc8xxx_gc->irqn);
return 0; return 0;
} }
#else
#define mpc8xxx_suspend NULL static DEFINE_RUNTIME_DEV_PM_OPS(mpc8xx_pm_ops,
#define mpc8xxx_resume NULL mpc8xxx_suspend, mpc8xxx_resume, NULL);
#endif
#ifdef CONFIG_ACPI #ifdef CONFIG_ACPI
static const struct acpi_device_id gpio_acpi_ids[] = { 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 = { static struct platform_driver mpc8xxx_plat_driver = {
.probe = mpc8xxx_probe, .probe = mpc8xxx_probe,
.remove_new = mpc8xxx_remove, .remove_new = mpc8xxx_remove,
.suspend = mpc8xxx_suspend,
.resume = mpc8xxx_resume,
.driver = { .driver = {
.name = "gpio-mpc8xxx", .name = "gpio-mpc8xxx",
.of_match_table = mpc8xxx_gpio_ids, .of_match_table = mpc8xxx_gpio_ids,
.acpi_match_table = ACPI_PTR(gpio_acpi_ids), .acpi_match_table = ACPI_PTR(gpio_acpi_ids),
.pm = pm_ptr(&mpc8xx_pm_ops),
}, },
}; };