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

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

@@ -474 +474 @@
         struct gameport *gameport;
 
-#ifdef CONFIG_PM_SLEEP
         u32 suspend_regs[SUSPEND_REGISTERS];
-#endif
-
 };
 
@@ -1900 +1897 @@
  * Power Management
  */
-#ifdef CONFIG_PM_SLEEP
-
 static const int saved_regs[SUSPEND_REGISTERS] = {
         BA0_JSCTL,
@@ -1990 +1985 @@
 }
 
-static SIMPLE_DEV_PM_OPS(cs4281_pm, cs4281_suspend, cs4281_resume);
-#define CS4281_PM_OPS   &cs4281_pm
-#else
-#define CS4281_PM_OPS   NULL
-#endif /* CONFIG_PM_SLEEP */
+static DEFINE_SIMPLE_DEV_PM_OPS(cs4281_pm, cs4281_suspend, cs4281_resume);
 
 static struct pci_driver cs4281_driver = {
@@ -2001 +1992 @@
         .probe = snd_cs4281_probe,
         .driver = {
-                .pm = CS4281_PM_OPS,
+                .pm = &cs4281_pm,
         },
 };