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

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

@@ -530 +530 @@
 }
 
-#ifdef CONFIG_PM_SLEEP
 static int snd_atiixp_aclink_down(struct atiixp *chip)
 {
@@ -540 +539 @@
         return 0;
 }
-#endif
 
 /*
@@ -1464 +1462 @@
 
 
-#ifdef CONFIG_PM_SLEEP
 /*
  * power management
@@ -1509 +1506 @@
 }
 
-static SIMPLE_DEV_PM_OPS(snd_atiixp_pm, snd_atiixp_suspend, snd_atiixp_resume);
-#define SND_ATIIXP_PM_OPS       &snd_atiixp_pm
-#else
-#define SND_ATIIXP_PM_OPS       NULL
-#endif /* CONFIG_PM_SLEEP */
-
+static DEFINE_SIMPLE_DEV_PM_OPS(snd_atiixp_pm, snd_atiixp_suspend, snd_atiixp_resume);
 
 /*
@@ -1647 +1639 @@
         .probe = snd_atiixp_probe,
         .driver = {
-                .pm = SND_ATIIXP_PM_OPS,
+                .pm = &snd_atiixp_pm,
         },
 };