From 293de8964e8a34ab9adf7719efb3fb87bd20f5a7 Mon Sep 17 00:00:00 2001 From: Tim Crawford Date: Tue, 10 Jun 2025 15:12:58 -0600 Subject: [PATCH] Move suspend/resume functions to dev_pm_ops Replace deprecated interface functions with newer PM interface. Signed-off-by: Tim Crawford --- src/system76.c | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/src/system76.c b/src/system76.c index c35a206..8c64fff 100644 --- a/src/system76.c +++ b/src/system76.c @@ -246,7 +246,7 @@ static int s76_remove(struct platform_device *dev) #endif } -static int s76_suspend(struct platform_device *dev, pm_message_t status) +static int s76_suspend(struct device *dev) { pr_debug("%s\n", __func__); @@ -257,7 +257,7 @@ static int s76_suspend(struct platform_device *dev, pm_message_t status) return 0; } -static int s76_resume(struct platform_device *dev) +static int s76_resume(struct device *dev) { pr_debug("%s\n", __func__); @@ -281,13 +281,22 @@ static int s76_resume(struct platform_device *dev) return 0; } +#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 17, 0) +static DEFINE_SIMPLE_DEV_PM_OPS(s76_pm, s76_suspend, s76_resume); +#else +static SIMPLE_DEV_PM_OPS(s76_pm, s76_suspend, s76_resume); +#endif + static struct platform_driver s76_platform_driver = { .remove = s76_remove, - .suspend = s76_suspend, - .resume = s76_resume, .driver = { .name = S76_DRIVER_NAME, .owner = THIS_MODULE, +#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 17, 0) + .pm = pm_sleep_ptr(&s76_pm), +#else + .pm = pm_ptr(&s76_pm), +#endif }, };