From: Takashi Iwai Date: Thu, 13 Mar 2025 17:07:21 +0000 (+0100) Subject: ALSA: pcm: Convert to SYSTEM_SLEEP_PM_OPS() X-Git-Tag: v6.15-rc1~173^2~17 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0d8dfeba4b8076e7b056411d743c797e4cdc11e3;p=thirdparty%2Flinux.git ALSA: pcm: Convert to SYSTEM_SLEEP_PM_OPS() Use the newer SYSTEM_SLEEP_PM_OPS() macro instead of SET_SYSTEM_SLEEP_PM_OPS(), which makes CONFIG_PM_SLEEP ifdefs superfluous. Merely a cleanup, there should be no actual code change. Signed-off-by: Takashi Iwai Link: https://patch.msgid.link/20250313170731.26943-4-tiwai@suse.de --- diff --git a/sound/core/pcm.c b/sound/core/pcm.c index 290690fc2abcb..283aac441fa0a 100644 --- a/sound/core/pcm.c +++ b/sound/core/pcm.c @@ -592,7 +592,6 @@ static const struct attribute_group *pcm_dev_attr_groups[]; * PM callbacks: we need to deal only with suspend here, as the resume is * triggered either from user-space or the driver's resume callback */ -#ifdef CONFIG_PM_SLEEP static int do_pcm_suspend(struct device *dev) { struct snd_pcm_str *pstr = dev_get_drvdata(dev); @@ -601,10 +600,9 @@ static int do_pcm_suspend(struct device *dev) snd_pcm_suspend_all(pstr->pcm); return 0; } -#endif static const struct dev_pm_ops pcm_dev_pm_ops = { - SET_SYSTEM_SLEEP_PM_OPS(do_pcm_suspend, NULL) + SYSTEM_SLEEP_PM_OPS(do_pcm_suspend, NULL) }; /* device type for PCM -- basically only for passing PM callbacks */