firmware: arm_scmi: convert to SYSTEM_SLEEP_PM_OPS

[PATCH] firmware: arm_scmi: convert to SYSTEM_SLEEP_PM_OPS

Posted by Arnd Bergmann 3 months ago

From: Arnd Bergmann <arnd@arndb.de>

The old SET_SYSTEM_SLEEP_PM_OPS() macro leads to a warning about an
unused function:

drivers/firmware/arm_scmi/scmi_power_control.c:363:12: error: 'scmi_system_power_resume' defined but not used [-Werror=unused-function]
  363 | static int scmi_system_power_resume(struct device *dev)

The proper way to do this these days is to use SYSTEM_SLEEP_PM_OPS()
and pm_sleep_ptr().

Fixes: 9a0658d3991e ("firmware: arm_scmi: power_control: Ensure SCMI_SYSPOWER_IDLE is set early during resume")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
 drivers/firmware/arm_scmi/scmi_power_control.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/firmware/arm_scmi/scmi_power_control.c b/drivers/firmware/arm_scmi/scmi_power_control.c
index ab0cee0d4bec..955736336061 100644
--- a/drivers/firmware/arm_scmi/scmi_power_control.c
+++ b/drivers/firmware/arm_scmi/scmi_power_control.c
@@ -369,7 +369,7 @@ static int scmi_system_power_resume(struct device *dev)
 }
 
 static const struct dev_pm_ops scmi_system_power_pmops = {
-	SET_SYSTEM_SLEEP_PM_OPS(NULL, scmi_system_power_resume)
+	SYSTEM_SLEEP_PM_OPS(NULL, scmi_system_power_resume)
 };
 
 static const struct scmi_device_id scmi_id_table[] = {
@@ -380,7 +380,7 @@ MODULE_DEVICE_TABLE(scmi, scmi_id_table);
 
 static struct scmi_driver scmi_system_power_driver = {
 	.driver	= {
-		.pm = &scmi_system_power_pmops,
+		.pm = pm_sleep_ptr(&scmi_system_power_pmops),
 	},
 	.name = "scmi-system-power",
 	.probe = scmi_syspower_probe,
-- 
2.39.5

Re: [PATCH] firmware: arm_scmi: convert to SYSTEM_SLEEP_PM_OPS

Posted by Jonathan Cameron 2 months, 3 weeks ago

On Wed,  9 Jul 2025 09:01:01 +0200
Arnd Bergmann <arnd@kernel.org> wrote:

> From: Arnd Bergmann <arnd@arndb.de>
> 
> The old SET_SYSTEM_SLEEP_PM_OPS() macro leads to a warning about an
> unused function:
> 
> drivers/firmware/arm_scmi/scmi_power_control.c:363:12: error: 'scmi_system_power_resume' defined but not used [-Werror=unused-function]
>   363 | static int scmi_system_power_resume(struct device *dev)
> 
> The proper way to do this these days is to use SYSTEM_SLEEP_PM_OPS()
> and pm_sleep_ptr().
> 
> Fixes: 9a0658d3991e ("firmware: arm_scmi: power_control: Ensure SCMI_SYSPOWER_IDLE is set early during resume")
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> ---
>  drivers/firmware/arm_scmi/scmi_power_control.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/firmware/arm_scmi/scmi_power_control.c b/drivers/firmware/arm_scmi/scmi_power_control.c
> index ab0cee0d4bec..955736336061 100644
> --- a/drivers/firmware/arm_scmi/scmi_power_control.c
> +++ b/drivers/firmware/arm_scmi/scmi_power_control.c
> @@ -369,7 +369,7 @@ static int scmi_system_power_resume(struct device *dev)
>  }
>  
>  static const struct dev_pm_ops scmi_system_power_pmops = {
> -	SET_SYSTEM_SLEEP_PM_OPS(NULL, scmi_system_power_resume)
> +	SYSTEM_SLEEP_PM_OPS(NULL, scmi_system_power_resume)
>  };

As a possible followup IIRC we have a macro for this

static DEFINE_SIMPLE_DEV_PM_OPS(scmi_system_power_pmops,
				NULL, scmi_system_power_resume);



>  
>  static const struct scmi_device_id scmi_id_table[] = {
> @@ -380,7 +380,7 @@ MODULE_DEVICE_TABLE(scmi, scmi_id_table);
>  
>  static struct scmi_driver scmi_system_power_driver = {
>  	.driver	= {
> -		.pm = &scmi_system_power_pmops,
> +		.pm = pm_sleep_ptr(&scmi_system_power_pmops),
>  	},
>  	.name = "scmi-system-power",
>  	.probe = scmi_syspower_probe,

Re: [PATCH] firmware: arm_scmi: convert to SYSTEM_SLEEP_PM_OPS

Posted by Sudeep Holla 3 months ago

On Wed, 09 Jul 2025 09:01:01 +0200, Arnd Bergmann wrote:
> The old SET_SYSTEM_SLEEP_PM_OPS() macro leads to a warning about an
> unused function:
> 
> drivers/firmware/arm_scmi/scmi_power_control.c:363:12: error: 'scmi_system_power_resume' defined but not used [-Werror=unused-function]
>   363 | static int scmi_system_power_resume(struct device *dev)
> 
> The proper way to do this these days is to use SYSTEM_SLEEP_PM_OPS()
> and pm_sleep_ptr().
> 
> [...]

Applied to sudeep.holla/linux (for-next/scmi/updates), thanks!

[1/1] firmware: arm_scmi: convert to SYSTEM_SLEEP_PM_OPS
      https://git.kernel.org/sudeep.holla/c/62d6b81e8bd2
--
Regards,
Sudeep