From 9335a36faacffb91f4e2b6e98454e58c9fed99fd Mon Sep 17 00:00:00 2001 From: Takashi Iwai Date: Thu, 13 Mar 2025 18:07:27 +0100 Subject: [PATCH] ALSA: intel-hdmi-audio: Convert to SYSTEM_SLEEP_PM_OPS() Use the newer SYSTEM_SLEEP_PM_OPS() macro instead of SET_SYSTEM_SLEEP_PM_OPS() together with pm_ptr(), which allows us dropping ugly __maybe_unused attributes. This optimizes slightly when CONFIG_PM is disabled, too. Signed-off-by: Takashi Iwai Link: https://patch.msgid.link/20250313170731.26943-10-tiwai@suse.de --- sound/x86/intel_hdmi_audio.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sound/x86/intel_hdmi_audio.c b/sound/x86/intel_hdmi_audio.c index d41ea09ffbe5..7fcc528a0204 100644 --- a/sound/x86/intel_hdmi_audio.c +++ b/sound/x86/intel_hdmi_audio.c @@ -1617,7 +1617,7 @@ static int had_create_jack(struct snd_intelhad *ctx, * PM callbacks */ -static int __maybe_unused hdmi_lpe_audio_suspend(struct device *dev) +static int hdmi_lpe_audio_suspend(struct device *dev) { struct snd_intelhad_card *card_ctx = dev_get_drvdata(dev); @@ -1626,7 +1626,7 @@ static int __maybe_unused hdmi_lpe_audio_suspend(struct device *dev) return 0; } -static int __maybe_unused hdmi_lpe_audio_resume(struct device *dev) +static int hdmi_lpe_audio_resume(struct device *dev) { struct snd_intelhad_card *card_ctx = dev_get_drvdata(dev); @@ -1833,13 +1833,13 @@ static int hdmi_lpe_audio_probe(struct platform_device *pdev) } static const struct dev_pm_ops hdmi_lpe_audio_pm = { - SET_SYSTEM_SLEEP_PM_OPS(hdmi_lpe_audio_suspend, hdmi_lpe_audio_resume) + SYSTEM_SLEEP_PM_OPS(hdmi_lpe_audio_suspend, hdmi_lpe_audio_resume) }; static struct platform_driver hdmi_lpe_audio_driver = { .driver = { .name = "hdmi-lpe-audio", - .pm = &hdmi_lpe_audio_pm, + .pm = pm_ptr(&hdmi_lpe_audio_pm), }, .probe = hdmi_lpe_audio_probe, }; -- 2.50.1