Changeset 629 for GPL/branches/uniaud32-next/alsa-kernel/pci/cs4281.c

Timestamp:

Jan 4, 2021, 10:15:17 AM (5 years ago)

Author:

Paul Smedley

Message:

Update source to linux 5.10.4 level

File:

• GPL/branches/uniaud32-next/alsa-kernel/pci/cs4281.c (modified) (11 diffs)

GPL/branches/uniaud32-next/alsa-kernel/pci/cs4281.c

@@ -784 +784 @@
 }
 
-static int snd_cs4281_hw_params(struct snd_pcm_substream *substream,
-                                struct snd_pcm_hw_params *hw_params)
-{
-        return snd_pcm_lib_malloc_pages(substream, params_buffer_bytes(hw_params));
-}
-
-static int snd_cs4281_hw_free(struct snd_pcm_substream *substream)
-{
-        return snd_pcm_lib_free_pages(substream);
-}
-
 static int snd_cs4281_playback_prepare(struct snd_pcm_substream *substream)
 {
@@ -942 +931 @@
         .open =         snd_cs4281_playback_open,
         .close =        snd_cs4281_playback_close,
-        .ioctl =        snd_pcm_lib_ioctl,
-        .hw_params =    snd_cs4281_hw_params,
-        .hw_free =      snd_cs4281_hw_free,
         .prepare =      snd_cs4281_playback_prepare,
         .trigger =      snd_cs4281_trigger,
@@ -953 +939 @@
         .open =         snd_cs4281_capture_open,
         .close =        snd_cs4281_capture_close,
-        .ioctl =        snd_pcm_lib_ioctl,
-        .hw_params =    snd_cs4281_hw_params,
-        .hw_free =      snd_cs4281_hw_free,
         .prepare =      snd_cs4281_capture_prepare,
         .trigger =      snd_cs4281_trigger,
@@ -978 +961 @@
         chip->pcm = pcm;
 
-        snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_DEV,
-                                              snd_dma_pci_data(chip->pci), 64*1024, 512*1024);
+        snd_pcm_set_managed_buffer_all(pcm, SNDRV_DMA_TYPE_DEV, &chip->pci->dev,
+                                       64*1024, 512*1024);
 
         return 0;
@@ -1085 +1068 @@
         struct snd_ac97_template ac97;
         int err;
-        static struct snd_ac97_bus_ops ops = {
+        static const struct snd_ac97_bus_ops ops = {
                 .write = snd_cs4281_ac97_write,
                 .read = snd_cs4281_ac97_read,
@@ -1150 +1133 @@
 }
 
-static struct snd_info_entry_ops snd_cs4281_proc_ops_BA0 = {
+static const struct snd_info_entry_ops snd_cs4281_proc_ops_BA0 = {
         .read = snd_cs4281_BA0_read,
 };
 
-static struct snd_info_entry_ops snd_cs4281_proc_ops_BA1 = {
+static const struct snd_info_entry_ops snd_cs4281_proc_ops_BA1 = {
         .read = snd_cs4281_BA1_read,
 };
@@ -1289 +1272 @@
         snd_cs4281_free_gameport(chip);
 
-        if (chip->irq >= 0)
-                synchronize_irq(chip->irq);
-
         /* Mask interrupts */
         snd_cs4281_pokeBA0(chip, BA0_HIMR, 0x7fffffff);
@@ -1328 +1308 @@
         unsigned int tmp;
         int err;
-        static struct snd_device_ops ops = {
+        static const struct snd_device_ops ops = {
                 .dev_free =     snd_cs4281_dev_free,
         };
@@ -1373 +1353 @@
         }
         chip->irq = pci->irq;
+        card->sync_irq = chip->irq;
 
         tmp = snd_cs4281_chip_init(chip);
@@ -1621 +1602 @@
                                         BA0_HISR_DMA(2) |
                                         BA0_HISR_DMA(3)));
-        synchronize_irq(chip->irq);
 
         return 0;
@@ -1963 +1943 @@
 #ifdef CONFIG_PM_SLEEP
 
-static int saved_regs[SUSPEND_REGISTERS] = {
+static const int saved_regs[SUSPEND_REGISTERS] = {
         BA0_JSCTL,
         BA0_GPIOR,