Changeset 629 for GPL/branches/uniaud32-next/alsa-kernel/pci/intel8x0m.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/intel8x0m.c (modified) (13 diffs)

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

@@ -289 +289 @@
 static unsigned int get_ich_codec_bit(struct intel8x0m *chip, unsigned int codec)
 {
-        static unsigned int codec_bit[3] = {
+        static const unsigned int codec_bit[3] = {
                 ICH_PCR, ICH_SCR, ICH_TCR
         };
@@ -554 +554 @@
 }
 
-static int snd_intel8x0m_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_intel8x0m_hw_free(struct snd_pcm_substream *substream)
-{
-        return snd_pcm_lib_free_pages(substream);
-}
-
 static snd_pcm_uframes_t snd_intel8x0m_pcm_pointer(struct snd_pcm_substream *substream)
 {
@@ -674 +663 @@
         .open =         snd_intel8x0m_playback_open,
         .close =        snd_intel8x0m_playback_close,
-        .ioctl =        snd_pcm_lib_ioctl,
-        .hw_params =    snd_intel8x0m_hw_params,
-        .hw_free =      snd_intel8x0m_hw_free,
         .prepare =      snd_intel8x0m_pcm_prepare,
         .trigger =      snd_intel8x0m_pcm_trigger,
@@ -685 +671 @@
         .open =         snd_intel8x0m_capture_open,
         .close =        snd_intel8x0m_capture_close,
-        .ioctl =        snd_pcm_lib_ioctl,
-        .hw_params =    snd_intel8x0m_hw_params,
-        .hw_free =      snd_intel8x0m_hw_free,
         .prepare =      snd_intel8x0m_pcm_prepare,
         .trigger =      snd_intel8x0m_pcm_trigger,
@@ -704 +687 @@
 
 static int snd_intel8x0m_pcm1(struct intel8x0m *chip, int device,
-                              struct ich_pcm_table *rec)
+                              const struct ich_pcm_table *rec)
 {
         struct snd_pcm *pcm;
@@ -734 +717 @@
         chip->pcm[device] = pcm;
 
-        snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_DEV,
-                                              snd_dma_pci_data(chip->pci),
-                                              rec->prealloc_size,
-                                              rec->prealloc_max_size);
-
-        return 0;
-}
-
-static struct ich_pcm_table intel_pcms[] = {
+        snd_pcm_set_managed_buffer_all(pcm, SNDRV_DMA_TYPE_DEV,
+                                       &chip->pci->dev,
+                                       rec->prealloc_size,
+                                       rec->prealloc_max_size);
+
+        return 0;
+}
+
+static const struct ich_pcm_table intel_pcms[] = {
         {
                 .suffix = "Modem",
@@ -755 +738 @@
 {
         int i, tblsize, device, err;
-        struct ich_pcm_table *tbl, *rec;
+        const struct ich_pcm_table *tbl, *rec;
 
 #if 1
@@ -819 +802 @@
         int err;
         unsigned int glob_sta = 0;
-        static struct snd_ac97_bus_ops ops = {
+        static const struct snd_ac97_bus_ops ops = {
                 .write = snd_intel8x0m_codec_write,
                 .read = snd_intel8x0m_codec_read,
@@ -1017 +1000 @@
                 free_irq(chip->irq, chip);
                 chip->irq = -1;
+                card->sync_irq = -1;
         }
         return 0;
@@ -1035 +1019 @@
         }
         chip->irq = pci->irq;
+        card->sync_irq = chip->irq;
         snd_intel8x0m_chip_init(chip, 0);
         snd_ac97_resume(chip->ac97);
@@ -1095 +1080 @@
         unsigned int int_sta_masks;
         struct ichdev *ichdev;
-        static struct snd_device_ops ops = {
+        static const struct snd_device_ops ops = {
                 .dev_free =     snd_intel8x0m_dev_free,
         };
-        static struct ich_reg_info intel_regs[2] = {
+        static const struct ich_reg_info intel_regs[2] = {
                 { ICH_MIINT, 0 },
                 { ICH_MOINT, 0x10 },
         };
-        struct ich_reg_info *tbl;
+        const struct ich_reg_info *tbl;
 
         *r_intel8x0m = NULL;
@@ -1177 +1162 @@
         /* allocate buffer descriptor lists */
         /* the start of each lists must be aligned to 8 bytes */
-        if (snd_dma_alloc_pages(SNDRV_DMA_TYPE_DEV, snd_dma_pci_data(pci),
+        if (snd_dma_alloc_pages(SNDRV_DMA_TYPE_DEV, &pci->dev,
                                 chip->bdbars_count * sizeof(u32) * ICH_MAX_FRAGS * 2,
                                 &chip->bdbars) < 0) {
@@ -1209 +1194 @@
         }
         chip->irq = pci->irq;
+        card->sync_irq = chip->irq;
 
         if ((err = snd_device_new(card, SNDRV_DEV_LOWLEVEL, chip, &ops)) < 0) {