Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 0d7392e54435476243ce08ba57745ab52d639cbb

Authored by Joe Perches
Committed by Takashi Iwai
1 parent 28d27aae94
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

sound: Use PCI_VDEVICE for CREATIVE and ECTIVA 

Here's a patch on top of the others to use CREATIVE and ECTIVA

Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>

Showing 4 changed files with 6 additions and 6 deletions Side-by-side Diff

sound/pci/ca0106/ca0106_main.c
Diff comments   View file @ 0d7392e
... ... @@ -1876,7 +1876,7 @@
1876 1876  
1877 1877 // PCI IDs
1878 1878 static struct pci_device_id snd_ca0106_ids[] = {
1879   - { 0x1102, 0x0007, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 }, /* Audigy LS or Live 24bit */
  1879 + { PCI_VDEVICE(CREATIVE, 0x0007), 0 }, /* Audigy LS or Live 24bit */
1880 1880 { 0, }
1881 1881 };
1882 1882 MODULE_DEVICE_TABLE(pci, snd_ca0106_ids);
sound/pci/emu10k1/emu10k1.c
Diff comments   View file @ 0d7392e
... ... @@ -77,9 +77,9 @@
77 77 * Class 0401: 1102:0008 (rev 00) Subsystem: 1102:1001 -> Audigy2 Value Model:SB0400
78 78 */
79 79 static struct pci_device_id snd_emu10k1_ids[] = {
80   - { 0x1102, 0x0002, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 }, /* EMU10K1 */
81   - { 0x1102, 0x0004, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 1 }, /* Audigy */
82   - { 0x1102, 0x0008, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 1 }, /* Audigy 2 Value SB0400 */
  80 + { PCI_VDEVICE(CREATIVE, 0x0002), 0 }, /* EMU10K1 */
  81 + { PCI_VDEVICE(CREATIVE, 0x0004), 1 }, /* Audigy */
  82 + { PCI_VDEVICE(CREATIVE, 0x0008), 1 }, /* Audigy 2 Value SB0400 */
83 83 { 0, }
84 84 };
85 85  
sound/pci/emu10k1/emu10k1x.c
Diff comments   View file @ 0d7392e
... ... @@ -1607,7 +1607,7 @@
1607 1607  
1608 1608 // PCI IDs
1609 1609 static struct pci_device_id snd_emu10k1x_ids[] = {
1610   - { 0x1102, 0x0006, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 }, /* Dell OEM version (EMU10K1) */
  1610 + { PCI_VDEVICE(CREATIVE, 0x0006), 0 }, /* Dell OEM version (EMU10K1) */
1611 1611 { 0, }
1612 1612 };
1613 1613 MODULE_DEVICE_TABLE(pci, snd_emu10k1x_ids);
... ... @@ -450,7 +450,7 @@
450 450 #ifdef CHIP1371
451 451 { PCI_VDEVICE(ENSONIQ, 0x1371), 0, }, /* ES1371 */
452 452 { PCI_VDEVICE(ENSONIQ, 0x5880), 0, }, /* ES1373 - CT5880 */
453   - { 0x1102, 0x8938, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0, }, /* Ectiva EV1938 */
  453 + { PCI_VDEVICE(ECTIVA, 0x8938), 0, }, /* Ectiva EV1938 */
454 454 #endif
455 455 { 0, }
456 456 };