Changeset 598 for GPL/trunk/alsa-kernel/pci/bt87x.c

Timestamp:

Apr 3, 2017, 4:51:56 PM (8 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/bt87x.c (modified) (4 diffs)

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

@@ -643 +643 @@
                                          struct snd_ctl_elem_info *info)
 {
-        static char *texts[3] = {"TV Tuner", "FM", "Mic/Line"};
-
-        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] = {"TV Tuner", "FM", "Mic/Line"};
+
+        return snd_ctl_enum_info(info, 1, 3, texts);
 }
 
@@ -801 +795 @@
 /* driver_data is the card id for that device */
 
-static struct pci_device_id snd_bt87x_ids[] = {
+static DEFINE_PCI_DEVICE_TABLE(snd_bt87x_ids) = {
         /* Hauppauge WinTV series */
         BT_DEVICE(PCI_DEVICE_ID_BROOKTREE_878, 0x0070, 0x13eb, GENERIC),
@@ -814 +808 @@
         /* Leadtek Winfast tv 2000xp delux */
         BT_DEVICE(PCI_DEVICE_ID_BROOKTREE_878, 0x107d, 0x6606, GENERIC),
+        /* Pinnacle PCTV */
+        BT_DEVICE(PCI_DEVICE_ID_BROOKTREE_878, 0x11bd, 0x0012, GENERIC),
         /* Voodoo TV 200 */
         BT_DEVICE(PCI_DEVICE_ID_BROOKTREE_878, 0x121a, 0x3000, GENERIC),
@@ -995 +991 @@
 /* default entries for all Bt87x cards - it's not exported */
 /* driver_data is set to 0 to call detection */
-static struct pci_device_id snd_bt87x_default_ids[] __devinitdata = {
+static DEFINE_PCI_DEVICE_TABLE(snd_bt87x_default_ids) = {
         BT_DEVICE(PCI_DEVICE_ID_BROOKTREE_878, PCI_ANY_ID, PCI_ANY_ID, UNKNOWN),
         BT_DEVICE(PCI_DEVICE_ID_BROOKTREE_879, PCI_ANY_ID, PCI_ANY_ID, UNKNOWN),