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

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

@@ -489 +489 @@
         struct list_head list;
 
-#ifdef CONFIG_PM_SLEEP
         u16 wc_map[4];
-#endif
 };
 
@@ -542 +540 @@
         spinlock_t substream_lock;
 
-#ifdef CONFIG_PM_SLEEP
         u16 apu_map[NR_APUS][NR_APU_REGS];
-#endif
 
 #ifdef SUPPORT_JOYSTICK
@@ -705 +701 @@
         if (snd_BUG_ON(channel >= NR_APUS))
                 return;
-#ifdef CONFIG_PM_SLEEP
         chip->apu_map[channel][reg] = data;
-#endif
         reg |= (channel << 4);
         apu_index_set(chip, reg);
@@ -992 +986 @@
         wave_set_register(chip, es->apu[channel] << 3, tmpval);
 
-#ifdef CONFIG_PM_SLEEP
         es->wc_map[channel] = tmpval;
-#endif
 }
 
@@ -2393 +2385 @@
 }
 
-#ifdef CONFIG_PM_SLEEP
 /*
  * PM support
@@ -2455 +2446 @@
 }
 
-static SIMPLE_DEV_PM_OPS(es1968_pm, es1968_suspend, es1968_resume);
-#define ES1968_PM_OPS   &es1968_pm
-#else
-#define ES1968_PM_OPS   NULL
-#endif /* CONFIG_PM_SLEEP */
+static DEFINE_SIMPLE_DEV_PM_OPS(es1968_pm, es1968_suspend, es1968_resume);
 
 #ifdef SUPPORT_JOYSTICK
@@ -2889 +2876 @@
         .probe = snd_es1968_probe,
         .driver = {
-                .pm = ES1968_PM_OPS,
+                .pm = &es1968_pm,
         },
 };