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

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

@@ -496 +496 @@
         spinlock_t reg_lock;
 
-#ifdef CONFIG_PM_SLEEP
         unsigned int saved_regs[0x20];
         unsigned char saved_mixers[0x20];
-#endif
 };
 
@@ -1582 +1580 @@
 };
 
-static const unsigned int rate_constraints[] = { 5512, 8000, 11025, 16000, 22050,
-                        32000, 44100, 48000, 88200, 96000, 128000 };
-static const struct snd_pcm_hw_constraint_list hw_constraints_rates = {
-                .count = ARRAY_SIZE(rate_constraints),
-                .list = rate_constraints,
-                .mask = 0,
-};
-
 /*
  * check device open/close
@@ -1661 +1651 @@
                 runtime->hw.rate_max = 96000;
         } else if (cm->chip_version == 55) {
-                err = snd_pcm_hw_constraint_list(runtime, 0,
-                        SNDRV_PCM_HW_PARAM_RATE, &hw_constraints_rates);
-                if (err < 0)
-                        return err;
-                runtime->hw.rates |= SNDRV_PCM_RATE_KNOT;
+                runtime->hw.rates |= SNDRV_PCM_RATE_88200 |
+                                     SNDRV_PCM_RATE_96000 |
+                                     SNDRV_PCM_RATE_128000;
                 runtime->hw.rate_max = 128000;
         }
@@ -1687 +1675 @@
                 runtime->hw.rates = SNDRV_PCM_RATE_44100 | SNDRV_PCM_RATE_48000;
         } else if (cm->chip_version == 55) {
-                err = snd_pcm_hw_constraint_list(runtime, 0,
-                        SNDRV_PCM_HW_PARAM_RATE, &hw_constraints_rates);
-                if (err < 0)
-                        return err;
-                runtime->hw.rates |= SNDRV_PCM_RATE_KNOT;
+                runtime->hw.rates |= SNDRV_PCM_RATE_88200 |
+                                     SNDRV_PCM_RATE_96000 |
+                                     SNDRV_PCM_RATE_128000;
                 runtime->hw.rate_max = 128000;
         }
@@ -1727 +1713 @@
                 runtime->hw.rate_max = 96000;
         } else if (cm->chip_version == 55) {
-                err = snd_pcm_hw_constraint_list(runtime, 0,
-                        SNDRV_PCM_HW_PARAM_RATE, &hw_constraints_rates);
-                if (err < 0)
-                        return err;
-                runtime->hw.rates |= SNDRV_PCM_RATE_KNOT;
+                runtime->hw.rates |= SNDRV_PCM_RATE_88200 |
+                                     SNDRV_PCM_RATE_96000 |
+                                     SNDRV_PCM_RATE_128000;
                 runtime->hw.rate_max = 128000;
         }
@@ -3281 +3265 @@
 }
 
-#ifdef CONFIG_PM_SLEEP
 /*
  * power management
@@ -3345 +3328 @@
 }
 
-static SIMPLE_DEV_PM_OPS(snd_cmipci_pm, snd_cmipci_suspend, snd_cmipci_resume);
-#define SND_CMIPCI_PM_OPS       &snd_cmipci_pm
-#else
-#define SND_CMIPCI_PM_OPS       NULL
-#endif /* CONFIG_PM_SLEEP */
+static DEFINE_SIMPLE_DEV_PM_OPS(snd_cmipci_pm, snd_cmipci_suspend, snd_cmipci_resume);
 
 static struct pci_driver cmipci_driver = {
@@ -3356 +3335 @@
         .probe = snd_cmipci_probe,
         .driver = {
-                .pm = SND_CMIPCI_PM_OPS,
+                .pm = &snd_cmipci_pm,
         },
 };