Changeset 777 for GPL/trunk/alsa-kernel/pci/intel8x0.c

Timestamp:

Apr 21, 2025, 7:17:25 PM (5 months ago)

Author:

David Azarewicz

Message:

Merge from uniaud32-exp branch

Location:

GPL/trunk

Files:

• . (modified) (1 prop)
• alsa-kernel/pci/intel8x0.c (modified) (5 diffs)

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

@@ -707 +707 @@
                 step = 0;
         } else if (civ == ichdev->civ) {
-                // snd_printd("civ same %d\n", civ);
                 step = 1;
                 ichdev->civ++;
@@ -715 +714 @@
                 if (step < 0)
                         step += ICH_REG_LVI_MASK + 1;
-                // if (step != 1)
-                //      snd_printd("step = %d, %d -> %d\n", step, ichdev->civ, civ);
                 ichdev->civ = civ;
         }
@@ -2561 +2558 @@
 }
 
-#ifdef CONFIG_PM_SLEEP
 /*
  * power management
@@ -2634 +2630 @@
 }
 
-static SIMPLE_DEV_PM_OPS(intel8x0_pm, intel8x0_suspend, intel8x0_resume);
-#define INTEL8X0_PM_OPS &intel8x0_pm
-#else
-#define INTEL8X0_PM_OPS NULL
-#endif /* CONFIG_PM_SLEEP */
+static DEFINE_SIMPLE_DEV_PM_OPS(intel8x0_pm, intel8x0_suspend, intel8x0_resume);
 
 #define INTEL8X0_TESTBUF_SIZE   32768   /* enough large for one shot */
@@ -3224 +3216 @@
         .probe = snd_intel8x0_probe,
         .driver = {
-                .pm = INTEL8X0_PM_OPS,
+                .pm = &intel8x0_pm,
         },
 };