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

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

@@ -815 +815 @@
 MODULE_DEVICE_TABLE(pci, snd_m3_ids);
 
-static struct snd_pci_quirk m3_amp_quirk_list[] = {
+static const struct snd_pci_quirk m3_amp_quirk_list[] = {
         SND_PCI_QUIRK(0x0E11, 0x0094, "Compaq Evo N600c", 0x0c),
         SND_PCI_QUIRK(0x10f7, 0x833e, "Panasonic CF-28", 0x0d),
@@ -824 +824 @@
 };
 
-static struct snd_pci_quirk m3_irda_quirk_list[] = {
+static const struct snd_pci_quirk m3_irda_quirk_list[] = {
         SND_PCI_QUIRK(0x1028, 0x00b0, "Dell Inspiron 4000", 1),
         SND_PCI_QUIRK(0x1028, 0x00a4, "Dell Inspiron 8000", 1),
@@ -832 +832 @@
 
 /* hardware volume quirks */
-static struct snd_pci_quirk m3_hv_quirk_list[] = {
+static const struct snd_pci_quirk m3_hv_quirk_list[] = {
         /* Allegro chips */
         SND_PCI_QUIRK(0x0E11, 0x002E, NULL, HV_CTRL_ENABLE | HV_BUTTON_FROM_GD),
@@ -910 +910 @@
 
 /* HP Omnibook quirks */
-static struct snd_pci_quirk m3_omnibook_quirk_list[] = {
+static const struct snd_pci_quirk m3_omnibook_quirk_list[] = {
         SND_PCI_QUIRK_ID(0x103c, 0x0010), /* HP OmniBook 6000 */
         SND_PCI_QUIRK_ID(0x103c, 0x0011), /* HP OmniBook 500 */
@@ -1389 +1389 @@
 {
         struct m3_dma *s = substream->runtime->private_data;
-        int err;
-
-        if ((err = snd_pcm_lib_malloc_pages(substream, params_buffer_bytes(hw_params))) < 0)
-                return err;
+
         /* set buffer address */
         s->buffer_addr = substream->runtime->dma_addr;
@@ -1409 +1406 @@
                 return 0;
         s = substream->runtime->private_data;
-        snd_pcm_lib_free_pages(substream);
         s->buffer_addr = 0;
         return 0;
@@ -1830 +1826 @@
         .open =         snd_m3_playback_open,
         .close =        snd_m3_playback_close,
-        .ioctl =        snd_pcm_lib_ioctl,
         .hw_params =    snd_m3_pcm_hw_params,
         .hw_free =      snd_m3_pcm_hw_free,
@@ -1841 +1836 @@
         .open =         snd_m3_capture_open,
         .close =        snd_m3_capture_close,
-        .ioctl =        snd_pcm_lib_ioctl,
         .hw_params =    snd_m3_pcm_hw_params,
         .hw_free =      snd_m3_pcm_hw_free,
@@ -1868 +1862 @@
         chip->pcm = pcm;
         
-        snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_DEV,
-                                              snd_dma_pci_data(chip->pci), 64*1024, 64*1024);
+        snd_pcm_set_managed_buffer_all(pcm, SNDRV_DMA_TYPE_DEV,
+                                       &chip->pci->dev, 64*1024, 64*1024);
 
         return 0;
@@ -2050 +2044 @@
 #endif
         int err;
-        static struct snd_ac97_bus_ops ops = {
+        static const struct snd_ac97_bus_ops ops = {
                 .write = snd_m3_ac97_write,
                 .read = snd_m3_ac97_read,
@@ -2536 +2530 @@
         int i, err;
         const struct snd_pci_quirk *quirk;
-        static struct snd_device_ops ops = {
+        static const struct snd_device_ops ops = {
                 .dev_free =     snd_m3_dev_free,
         };
@@ -2647 +2641 @@
         }
         chip->irq = pci->irq;
+        card->sync_irq = chip->irq;
 
 #ifdef CONFIG_PM_SLEEP