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

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

@@ -777 +777 @@
         unsigned int in_suspend;
 
-#ifdef CONFIG_PM_SLEEP
         u16 *suspend_mem;
-#endif
 
         const struct firmware *assp_kernel_image;
@@ -2366 +2364 @@
         }
 
-#ifdef CONFIG_PM_SLEEP
         vfree(chip->suspend_mem);
-#endif
         release_firmware(chip->assp_kernel_image);
         release_firmware(chip->assp_minisrc_image);
@@ -2377 +2373 @@
  * APM support
  */
-#ifdef CONFIG_PM_SLEEP
 static int m3_suspend(struct device *dev)
 {
@@ -2451 +2446 @@
 }
 
-static SIMPLE_DEV_PM_OPS(m3_pm, m3_suspend, m3_resume);
-#define M3_PM_OPS       &m3_pm
-#else
-#define M3_PM_OPS       NULL
-#endif /* CONFIG_PM_SLEEP */
+static DEFINE_SIMPLE_DEV_PM_OPS(m3_pm, m3_suspend, m3_resume);
 
 #ifdef CONFIG_SND_MAESTRO3_INPUT
@@ -2599 +2590 @@
         card->sync_irq = chip->irq;
 
-#ifdef CONFIG_PM_SLEEP
+#ifndef TARGET_OS2
+        if (IS_ENABLED(CONFIG_PM_SLEEP)) {
         chip->suspend_mem =
                 vmalloc(array_size(sizeof(u16),
                                    REV_B_CODE_MEMORY_LENGTH +
                                         REV_B_DATA_MEMORY_LENGTH));
-        if (chip->suspend_mem == NULL)
+                if (!chip->suspend_mem)
                 dev_warn(card->dev, "can't allocate apm buffer\n");
+        }
 #endif
-
         err = snd_m3_mixer(chip);
         if (err < 0)
@@ -2718 +2710 @@
         .probe = snd_m3_probe,
         .driver = {
-                .pm = M3_PM_OPS,
+                .pm = &m3_pm,
         },
 };