ASoC: cs42l43: convert to SYSTEM_SLEEP_PM_OPS

Commit Message

Arnd Bergmann March 5, 2025, 5:27 p.m. UTC

From: Arnd Bergmann <[e-mail]>

The custom suspend function causes a build warning when CONFIG_PM_SLEEP
is disabled:

sound/soc/codecs/cs42l43.c:2405:12: error: unused function 'cs42l43_codec_runtime_force_suspend' [-Werror,-Wunused-function]

Change SET_SYSTEM_SLEEP_PM_OPS() to the newer SYSTEM_SLEEP_PM_OPS(),
to avoid this.

Fixes: 164b7dd4546b ("ASoC: cs42l43: Add jack delay debounce after suspend")
Signed-off-by: Arnd Bergmann <[e-mail]>
---
 sound/soc/codecs/cs42l43.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Charles Keepax March 6, 2025, 9:43 a.m. UTC | #1

On Wed, Mar 05, 2025 at 06:27:32PM +0100, Arnd Bergmann wrote:
> From: Arnd Bergmann <[e-mail]>
> 
> The custom suspend function causes a build warning when CONFIG_PM_SLEEP
> is disabled:
> 
> sound/soc/codecs/cs42l43.c:2405:12: error: unused function 'cs42l43_codec_runtime_force_suspend' [-Werror,-Wunused-function]
> 
> Change SET_SYSTEM_SLEEP_PM_OPS() to the newer SYSTEM_SLEEP_PM_OPS(),
> to avoid this.
> 
> Fixes: 164b7dd4546b ("ASoC: cs42l43: Add jack delay debounce after suspend")
> Signed-off-by: Arnd Bergmann <[e-mail]>
> ---

Apologies I should have spotted that in my review.

Reviewed-by: Charles Keepax <[e-mail]>

Thanks,
Charles

Maciej Strozek March 6, 2025, 1:59 p.m. UTC | #2

W dniu śro, 05.03.2025 o godzinie 18∶27 +0100, użytkownik Arnd Bergmann
napisał:
> From: Arnd Bergmann <[e-mail]>
> 
> The custom suspend function causes a build warning when
> CONFIG_PM_SLEEP
> is disabled:
> 
> sound/soc/codecs/cs42l43.c:2405:12: error: unused function
> 'cs42l43_codec_runtime_force_suspend' [-Werror,-Wunused-function]
> 
> Change SET_SYSTEM_SLEEP_PM_OPS() to the newer SYSTEM_SLEEP_PM_OPS(),
> to avoid this.
> 
> Fixes: 164b7dd4546b ("ASoC: cs42l43: Add jack delay debounce after
> suspend")
> Signed-off-by: Arnd Bergmann <[e-mail]>
> ---

Reviewed-by: Maciej Strozek <[e-mail]>

Mark Brown March 6, 2025, 4:10 p.m. UTC | #3

On Wed, 05 Mar 2025 18:27:32 +0100, Arnd Bergmann wrote:
> The custom suspend function causes a build warning when CONFIG_PM_SLEEP
> is disabled:
> 
> sound/soc/codecs/cs42l43.c:2405:12: error: unused function 'cs42l43_codec_runtime_force_suspend' [-Werror,-Wunused-function]
> 
> Change SET_SYSTEM_SLEEP_PM_OPS() to the newer SYSTEM_SLEEP_PM_OPS(),
> to avoid this.
> 
> [...]

Applied to

   https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next

Thanks!

[1/1] ASoC: cs42l43: convert to SYSTEM_SLEEP_PM_OPS
      commit: 2c2eadd07e747059ccd65e68cd1d1b23ca96b072

All being well this means that it will be integrated into the linux-next
tree (usually sometime in the next 24 hours) and sent to Linus during
the next merge window (or sooner if it is a bug fix), however if
problems are discovered then the patch may be dropped or reverted.

You may get further e-mails resulting from automated or manual testing
and review of the tree, please engage with people reporting problems and
send followup patches addressing any issues that are reported if needed.

If any updates are required or you are submitting further changes they
should be sent as incremental updates against current git, existing
patches will not be replaced.

Please add any relevant lists and maintainers to the CCs when replying
to this mail.

Thanks,
Mark

Patch

diff --git a/sound/soc/codecs/cs42l43.c b/sound/soc/codecs/cs42l43.c
index 4257dbefe9dd..e0d630c262f6 100644
--- a/sound/soc/codecs/cs42l43.c
+++ b/sound/soc/codecs/cs42l43.c
@@ -2417,7 +2417,7 @@  static int cs42l43_codec_runtime_force_suspend(struct device *dev)
 
 static const struct dev_pm_ops cs42l43_codec_pm_ops = {
 	RUNTIME_PM_OPS(NULL, cs42l43_codec_runtime_resume, NULL)
-	SET_SYSTEM_SLEEP_PM_OPS(cs42l43_codec_runtime_force_suspend, pm_runtime_force_resume)
+	SYSTEM_SLEEP_PM_OPS(cs42l43_codec_runtime_force_suspend, pm_runtime_force_resume)
 };
 
 static const struct platform_device_id cs42l43_codec_id_table[] = {