Changeset 598 for GPL/trunk/alsa-kernel/pci/ymfpci

Timestamp:

Apr 3, 2017, 4:51:56 PM (9 years ago)

Author:

David Azarewicz

Message:

Merged/reintegrated v2 branch into trunk. Trunk is now v2

Location:

GPL/trunk

Files:

• . (modified) (1 prop)
• alsa-kernel/pci/ymfpci/ymfpci.c (modified) (1 diff)
• alsa-kernel/pci/ymfpci/ymfpci_image.h (added)
• alsa-kernel/pci/ymfpci/ymfpci_main.c (modified) (5 diffs)

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

@@ -67 +67 @@
 MODULE_PARM_DESC(rear_switch, "Enable shared rear/line-in switch");
 
-static struct pci_device_id snd_ymfpci_ids[] = {
+static DEFINE_PCI_DEVICE_TABLE(snd_ymfpci_ids) = {
         { PCI_VDEVICE(YAMAHA, 0x0004), 0, },   /* YMF724 */
         { PCI_VDEVICE(YAMAHA, 0x000d), 0, },   /* YMF724F */

GPL/trunk/alsa-kernel/pci/ymfpci/ymfpci_main.c

@@ -847 +847 @@
 {
         .info =                 (SNDRV_PCM_INFO_MMAP |
-                                 SNDRV_PCM_INFO_MMAP_VALID |
+                                 SNDRV_PCM_INFO_MMAP_VALID | 
                                  SNDRV_PCM_INFO_INTERLEAVED |
                                  SNDRV_PCM_INFO_BLOCK_TRANSFER |
@@ -1390 +1390 @@
 static int snd_ymfpci_drec_source_info(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *info)
 {
-        static char *texts[3] = {"AC'97", "IEC958", "ZV Port"};
-
-        info->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;
-        info->count = 1;
-        info->value.enumerated.items = 3;
-        if (info->value.enumerated.item > 2)
-                info->value.enumerated.item = 2;
-        strcpy(info->value.enumerated.name, texts[info->value.enumerated.item]);
-        return 0;
+        static const char *const texts[3] = {"AC'97", "IEC958", "ZV Port"};
+
+        return snd_ctl_enum_info(info, 1, 3, texts);
 }
 
@@ -1958 +1952 @@
  */
 
-static void snd_ymfpci_proc_read(struct snd_info_entry *entry,
+static void snd_ymfpci_proc_read(struct snd_info_entry *entry, 
                                  struct snd_info_buffer *buffer)
 {
@@ -2112 +2106 @@
            covered with the kernel page allocation mechanism */
         if (snd_dma_alloc_pages(SNDRV_DMA_TYPE_DEV, snd_dma_pci_data(chip->pci),
-                                size, &chip->work_ptr) < 0)
+                                size, &chip->work_ptr) < 0) 
                 return -ENOMEM;
         ptr = chip->work_ptr.area;
@@ -2218 +2212 @@
 #if 0
         /* FIXME: temporarily disabled, otherwise we cannot fire up
-         * the chip again unless reboot.
+         * the chip again unless reboot.  ACPI bug?
          */
         pci_set_power_state(chip->pci, 3);