ACPI: SBS: use DEFINE_SIMPLE_DEV_PM_OPS

[PATCH] ACPI: SBS: use DEFINE_SIMPLE_DEV_PM_OPS

Posted by Triet Hoang 1 month, 1 week ago

Convert the deprecated SIMPLE_DEV_PM_OPS
to DEFINE_SIMPLE_DEV_PM_OPS

Also use pm_sleep_ptr() when assigning the ops to the driver.
This allows the removal of the ifdef CONFIG_PM_SLEEP.

Signed-off-by: Triet Hoang <triet.hoang.dev@gmail.com>
---
 drivers/acpi/sbs.c | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/drivers/acpi/sbs.c b/drivers/acpi/sbs.c
index 86b7c7975852..543ca5f0defa 100644
--- a/drivers/acpi/sbs.c
+++ b/drivers/acpi/sbs.c
@@ -692,17 +692,13 @@ static void acpi_sbs_remove(struct platform_device *pdev)
 	kfree(sbs);
 }
 
-#ifdef CONFIG_PM_SLEEP
 static int acpi_sbs_resume(struct device *dev)
 {
 	acpi_sbs_callback(dev_get_drvdata(dev));
 	return 0;
 }
-#else
-#define acpi_sbs_resume NULL
-#endif
 
-static SIMPLE_DEV_PM_OPS(acpi_sbs_pm, NULL, acpi_sbs_resume);
+static DEFINE_SIMPLE_DEV_PM_OPS(acpi_sbs_pm, NULL, acpi_sbs_resume);
 
 static struct platform_driver acpi_sbs_driver = {
 	.probe = acpi_sbs_probe,
@@ -710,7 +706,7 @@ static struct platform_driver acpi_sbs_driver = {
 	.driver = {
 		.name = "acpi-sbs",
 		.acpi_match_table = sbs_device_ids,
-		.pm = &acpi_sbs_pm,
+		.pm = pm_sleep_ptr(&acpi_sbs_pm),
 	},
 };
 
-- 
2.53.0

Re: [PATCH] ACPI: SBS: use DEFINE_SIMPLE_DEV_PM_OPS

Posted by Rafael J. Wysocki (Intel) 2 weeks, 5 days ago

On Thu, Aug 20, 2026 at 5:49 AM Triet Hoang <triet.hoang.dev@gmail.com> wrote:
>
> Convert the deprecated SIMPLE_DEV_PM_OPS
> to DEFINE_SIMPLE_DEV_PM_OPS
>
> Also use pm_sleep_ptr() when assigning the ops to the driver.
> This allows the removal of the ifdef CONFIG_PM_SLEEP.
>
> Signed-off-by: Triet Hoang <triet.hoang.dev@gmail.com>
> ---
>  drivers/acpi/sbs.c | 8 ++------
>  1 file changed, 2 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/acpi/sbs.c b/drivers/acpi/sbs.c
> index 86b7c7975852..543ca5f0defa 100644
> --- a/drivers/acpi/sbs.c
> +++ b/drivers/acpi/sbs.c
> @@ -692,17 +692,13 @@ static void acpi_sbs_remove(struct platform_device *pdev)
>         kfree(sbs);
>  }
>
> -#ifdef CONFIG_PM_SLEEP
>  static int acpi_sbs_resume(struct device *dev)
>  {
>         acpi_sbs_callback(dev_get_drvdata(dev));
>         return 0;
>  }
> -#else
> -#define acpi_sbs_resume NULL
> -#endif

So the function above is going to be unused when CONFIG_PM_SLEEP is
unset if I'm not mistaken.

Is this really an improvement?

> -static SIMPLE_DEV_PM_OPS(acpi_sbs_pm, NULL, acpi_sbs_resume);
> +static DEFINE_SIMPLE_DEV_PM_OPS(acpi_sbs_pm, NULL, acpi_sbs_resume);
>
>  static struct platform_driver acpi_sbs_driver = {
>         .probe = acpi_sbs_probe,
> @@ -710,7 +706,7 @@ static struct platform_driver acpi_sbs_driver = {
>         .driver = {
>                 .name = "acpi-sbs",
>                 .acpi_match_table = sbs_device_ids,
> -               .pm = &acpi_sbs_pm,
> +               .pm = pm_sleep_ptr(&acpi_sbs_pm),
>         },
>  };
>
> --
> 2.53.0
>