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

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

@@ -231 +231 @@
 #endif
 
-#ifdef CONFIG_PM_SLEEP
         u16 saved_regs[0x20];
-#endif
 };
 
@@ -1352 +1350 @@
 }
 
-#ifdef CONFIG_PM_SLEEP
 static const unsigned char saved_regs[] = {
         FM801_PCM_VOL, FM801_I2S_VOL, FM801_FM_VOL, FM801_REC_SRC,
@@ -1409 +1406 @@
 }
 
-static SIMPLE_DEV_PM_OPS(snd_fm801_pm, snd_fm801_suspend, snd_fm801_resume);
-#define SND_FM801_PM_OPS        &snd_fm801_pm
-#else
-#define SND_FM801_PM_OPS        NULL
-#endif /* CONFIG_PM_SLEEP */
+static DEFINE_SIMPLE_DEV_PM_OPS(snd_fm801_pm, snd_fm801_suspend, snd_fm801_resume);
 
 static struct pci_driver fm801_driver = {
@@ -1420 +1413 @@
         .probe = snd_card_fm801_probe,
         .driver = {
-                .pm = SND_FM801_PM_OPS,
+                .pm = &snd_fm801_pm,
         },
 };