Changeset 777 for GPL/trunk/alsa-kernel/pci/ens1370.c

Timestamp:

Apr 21, 2025, 7:17:25 PM (4 months ago)

Author:

David Azarewicz

Message:

Merge from uniaud32-exp branch

Location:

GPL/trunk

Files:

• . (modified) (1 prop)
• alsa-kernel/pci/ens1370.c (modified) (3 diffs)

GPL/trunk/alsa-kernel/pci/ens1370.c

@@ -1980 +1980 @@
 }
 
-#ifdef CONFIG_PM_SLEEP
 static int snd_ensoniq_suspend(struct device *dev)
 {
@@ -2019 +2018 @@
 }
 
-static SIMPLE_DEV_PM_OPS(snd_ensoniq_pm, snd_ensoniq_suspend, snd_ensoniq_resume);
-#define SND_ENSONIQ_PM_OPS      &snd_ensoniq_pm
-#else
-#define SND_ENSONIQ_PM_OPS      NULL
-#endif /* CONFIG_PM_SLEEP */
+static DEFINE_SIMPLE_DEV_PM_OPS(snd_ensoniq_pm, snd_ensoniq_suspend, snd_ensoniq_resume);
 
 static int snd_ensoniq_create(struct snd_card *card,
@@ -2396 +2391 @@
         .probe = snd_audiopci_probe,
         .driver = {
-                .pm = SND_ENSONIQ_PM_OPS,
+                .pm = &snd_ensoniq_pm,
         },
 };