Changeset 777 for GPL/trunk/alsa-kernel/pci/als4000.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/als4000.c (modified) (3 diffs)

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

@@ -940 +940 @@
 }
 
-#ifdef CONFIG_PM_SLEEP
 static int snd_als4000_suspend(struct device *dev)
 {
@@ -972 +971 @@
 }
 
-static SIMPLE_DEV_PM_OPS(snd_als4000_pm, snd_als4000_suspend, snd_als4000_resume);
-#define SND_ALS4000_PM_OPS      &snd_als4000_pm
-#else
-#define SND_ALS4000_PM_OPS      NULL
-#endif /* CONFIG_PM_SLEEP */
+static DEFINE_SIMPLE_DEV_PM_OPS(snd_als4000_pm, snd_als4000_suspend, snd_als4000_resume);
 
 static struct pci_driver als4000_driver = {
@@ -983 +978 @@
         .probe = snd_card_als4000_probe,
         .driver = {
-                .pm = SND_ALS4000_PM_OPS,
+                .pm = &snd_als4000_pm,
         },
 };