]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
ALSA: intel-hdmi-audio: Convert to SYSTEM_SLEEP_PM_OPS()
authorTakashi Iwai <tiwai@suse.de>
Thu, 13 Mar 2025 17:07:27 +0000 (18:07 +0100)
committerTakashi Iwai <tiwai@suse.de>
Fri, 14 Mar 2025 10:07:14 +0000 (11:07 +0100)
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 <tiwai@suse.de>
Link: https://patch.msgid.link/20250313170731.26943-10-tiwai@suse.de
sound/x86/intel_hdmi_audio.c

index d41ea09ffbe56ba9f6235690873c384c2e0632ab..7fcc528a0204624a5aedb65d875f8e7f1dc278af 100644 (file)
@@ -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,
 };