Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
tjh.dev
kernel
os
linux
Merge branch 'fix/pci-vdevice' into for-linus
* fix/pci-vdevice:
sound: Use PCI_VDEVICE for CREATIVE and ECTIVA
sound: Use PCI_VDEVICE
+1
-1
sound/oss/kahlua.c
+1
-1
sound/oss/kahlua.c
+4
-4
sound/pci/atiixp.c
+4
-4
sound/pci/atiixp.c
···
287
287
/*
288
288
*/
289
289
static struct pci_device_id snd_atiixp_ids[] = {
290
-
{ 0x1002, 0x4341, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 }, /* SB200 */
291
-
{ 0x1002, 0x4361, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 }, /* SB300 */
292
-
{ 0x1002, 0x4370, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 }, /* SB400 */
293
-
{ 0x1002, 0x4382, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 }, /* SB600 */
290
+
{ PCI_VDEVICE(ATI, 0x4341), 0 }, /* SB200 */
291
+
{ PCI_VDEVICE(ATI, 0x4361), 0 }, /* SB300 */
292
+
{ PCI_VDEVICE(ATI, 0x4370), 0 }, /* SB400 */
293
+
{ PCI_VDEVICE(ATI, 0x4382), 0 }, /* SB600 */
294
294
{ 0, }
295
295
};
296
296
+2
-2
sound/pci/atiixp_modem.c
+2
-2
sound/pci/atiixp_modem.c
···
262
262
/*
263
263
*/
264
264
static struct pci_device_id snd_atiixp_ids[] = {
265
-
{ 0x1002, 0x434d, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 }, /* SB200 */
266
-
{ 0x1002, 0x4378, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 }, /* SB400 */
265
+
{ PCI_VDEVICE(ATI, 0x434d), 0 }, /* SB200 */
266
+
{ PCI_VDEVICE(ATI, 0x4378), 0 }, /* SB400 */
267
267
{ 0, }
268
268
};
269
269
+1
-2
sound/pci/au88x0/au8810.c
+1
-2
sound/pci/au88x0/au8810.c
+1
-2
sound/pci/au88x0/au8820.c
+1
-2
sound/pci/au88x0/au8820.c
+1
-2
sound/pci/au88x0/au8830.c
+1
-2
sound/pci/au88x0/au8830.c
+1
-1
sound/pci/ca0106/ca0106_main.c
+1
-1
sound/pci/ca0106/ca0106_main.c
···
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);
+5
-5
sound/pci/cmipci.c
+5
-5
sound/pci/cmipci.c
···
2797
2797
2798
2798
2799
2799
static struct pci_device_id snd_cmipci_ids[] = {
2800
-
{PCI_VENDOR_ID_CMEDIA, PCI_DEVICE_ID_CMEDIA_CM8338A, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
2801
-
{PCI_VENDOR_ID_CMEDIA, PCI_DEVICE_ID_CMEDIA_CM8338B, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
2802
-
{PCI_VENDOR_ID_CMEDIA, PCI_DEVICE_ID_CMEDIA_CM8738, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
2803
-
{PCI_VENDOR_ID_CMEDIA, PCI_DEVICE_ID_CMEDIA_CM8738B, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
2804
-
{PCI_VENDOR_ID_AL, PCI_DEVICE_ID_CMEDIA_CM8738, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
2800
+
{PCI_VDEVICE(CMEDIA, PCI_DEVICE_ID_CMEDIA_CM8338A), 0},
2801
+
{PCI_VDEVICE(CMEDIA, PCI_DEVICE_ID_CMEDIA_CM8338B), 0},
2802
+
{PCI_VDEVICE(CMEDIA, PCI_DEVICE_ID_CMEDIA_CM8738), 0},
2803
+
{PCI_VDEVICE(CMEDIA, PCI_DEVICE_ID_CMEDIA_CM8738B), 0},
2804
+
{PCI_VDEVICE(AL, PCI_DEVICE_ID_CMEDIA_CM8738), 0},
2805
2805
{0,},
2806
2806
};
2807
2807
+1
-1
sound/pci/cs4281.c
+1
-1
sound/pci/cs4281.c
···
495
495
static irqreturn_t snd_cs4281_interrupt(int irq, void *dev_id);
496
496
497
497
static struct pci_device_id snd_cs4281_ids[] = {
498
-
{ 0x1013, 0x6005, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0, }, /* CS4281 */
498
+
{ PCI_VDEVICE(CIRRUS, 0x6005), 0, }, /* CS4281 */
499
499
{ 0, }
500
500
};
501
501
+3
-3
sound/pci/cs46xx/cs46xx.c
+3
-3
sound/pci/cs46xx/cs46xx.c
···
65
65
MODULE_PARM_DESC(mmap_valid, "Support OSS mmap.");
66
66
67
67
static struct pci_device_id snd_cs46xx_ids[] = {
68
-
{ 0x1013, 0x6001, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0, }, /* CS4280 */
69
-
{ 0x1013, 0x6003, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0, }, /* CS4612 */
70
-
{ 0x1013, 0x6004, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0, }, /* CS4615 */
68
+
{ PCI_VDEVICE(CIRRUS, 0x6001), 0, }, /* CS4280 */
69
+
{ PCI_VDEVICE(CIRRUS, 0x6003), 0, }, /* CS4612 */
70
+
{ PCI_VDEVICE(CIRRUS, 0x6004), 0, }, /* CS4615 */
71
71
{ 0, }
72
72
};
73
73
+3
-3
sound/pci/emu10k1/emu10k1.c
+3
-3
sound/pci/emu10k1/emu10k1.c
···
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
+1
-1
sound/pci/emu10k1/emu10k1x.c
+1
-1
sound/pci/emu10k1/emu10k1x.c
···
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);
+4
-4
sound/pci/ens1370.c
+4
-4
sound/pci/ens1370.c
···
445
445
446
446
static struct pci_device_id snd_audiopci_ids[] = {
447
447
#ifdef CHIP1370
448
-
{ 0x1274, 0x5000, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0, }, /* ES1370 */
448
+
{ PCI_VDEVICE(ENSONIQ, 0x5000), 0, }, /* ES1370 */
449
449
#endif
450
450
#ifdef CHIP1371
451
-
{ 0x1274, 0x1371, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0, }, /* ES1371 */
452
-
{ 0x1274, 0x5880, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0, }, /* ES1373 - CT5880 */
453
-
{ 0x1102, 0x8938, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0, }, /* Ectiva EV1938 */
451
+
{ PCI_VDEVICE(ENSONIQ, 0x1371), 0, }, /* ES1371 */
452
+
{ PCI_VDEVICE(ENSONIQ, 0x5880), 0, }, /* ES1373 - CT5880 */
453
+
{ PCI_VDEVICE(ECTIVA, 0x8938), 0, }, /* Ectiva EV1938 */
454
454
#endif
455
455
{ 0, }
456
456
};
+1
-1
sound/pci/es1938.c
+1
-1
sound/pci/es1938.c
···
244
244
static irqreturn_t snd_es1938_interrupt(int irq, void *dev_id);
245
245
246
246
static struct pci_device_id snd_es1938_ids[] = {
247
-
{ 0x125d, 0x1969, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0, }, /* Solo-1 */
247
+
{ PCI_VDEVICE(ESS, 0x1969), 0, }, /* Solo-1 */
248
248
{ 0, }
249
249
};
250
250
+1
-1
sound/pci/ice1712/ice1712.c
+1
-1
sound/pci/ice1712/ice1712.c
+1
-1
sound/pci/ice1712/ice1724.c
+1
-1
sound/pci/ice1712/ice1724.c
+23
-23
sound/pci/intel8x0.c
+23
-23
sound/pci/intel8x0.c
···
421
421
};
422
422
423
423
static struct pci_device_id snd_intel8x0_ids[] = {
424
-
{ 0x8086, 0x2415, PCI_ANY_ID, PCI_ANY_ID, 0, 0, DEVICE_INTEL }, /* 82801AA */
425
-
{ 0x8086, 0x2425, PCI_ANY_ID, PCI_ANY_ID, 0, 0, DEVICE_INTEL }, /* 82901AB */
426
-
{ 0x8086, 0x2445, PCI_ANY_ID, PCI_ANY_ID, 0, 0, DEVICE_INTEL }, /* 82801BA */
427
-
{ 0x8086, 0x2485, PCI_ANY_ID, PCI_ANY_ID, 0, 0, DEVICE_INTEL }, /* ICH3 */
428
-
{ 0x8086, 0x24c5, PCI_ANY_ID, PCI_ANY_ID, 0, 0, DEVICE_INTEL_ICH4 }, /* ICH4 */
429
-
{ 0x8086, 0x24d5, PCI_ANY_ID, PCI_ANY_ID, 0, 0, DEVICE_INTEL_ICH4 }, /* ICH5 */
430
-
{ 0x8086, 0x25a6, PCI_ANY_ID, PCI_ANY_ID, 0, 0, DEVICE_INTEL_ICH4 }, /* ESB */
431
-
{ 0x8086, 0x266e, PCI_ANY_ID, PCI_ANY_ID, 0, 0, DEVICE_INTEL_ICH4 }, /* ICH6 */
432
-
{ 0x8086, 0x27de, PCI_ANY_ID, PCI_ANY_ID, 0, 0, DEVICE_INTEL_ICH4 }, /* ICH7 */
433
-
{ 0x8086, 0x2698, PCI_ANY_ID, PCI_ANY_ID, 0, 0, DEVICE_INTEL_ICH4 }, /* ESB2 */
434
-
{ 0x8086, 0x7195, PCI_ANY_ID, PCI_ANY_ID, 0, 0, DEVICE_INTEL }, /* 440MX */
435
-
{ 0x1039, 0x7012, PCI_ANY_ID, PCI_ANY_ID, 0, 0, DEVICE_SIS }, /* SI7012 */
436
-
{ 0x10de, 0x01b1, PCI_ANY_ID, PCI_ANY_ID, 0, 0, DEVICE_NFORCE }, /* NFORCE */
437
-
{ 0x10de, 0x003a, PCI_ANY_ID, PCI_ANY_ID, 0, 0, DEVICE_NFORCE }, /* MCP04 */
438
-
{ 0x10de, 0x006a, PCI_ANY_ID, PCI_ANY_ID, 0, 0, DEVICE_NFORCE }, /* NFORCE2 */
439
-
{ 0x10de, 0x0059, PCI_ANY_ID, PCI_ANY_ID, 0, 0, DEVICE_NFORCE }, /* CK804 */
440
-
{ 0x10de, 0x008a, PCI_ANY_ID, PCI_ANY_ID, 0, 0, DEVICE_NFORCE }, /* CK8 */
441
-
{ 0x10de, 0x00da, PCI_ANY_ID, PCI_ANY_ID, 0, 0, DEVICE_NFORCE }, /* NFORCE3 */
442
-
{ 0x10de, 0x00ea, PCI_ANY_ID, PCI_ANY_ID, 0, 0, DEVICE_NFORCE }, /* CK8S */
443
-
{ 0x10de, 0x026b, PCI_ANY_ID, PCI_ANY_ID, 0, 0, DEVICE_NFORCE }, /* MCP51 */
444
-
{ 0x1022, 0x746d, PCI_ANY_ID, PCI_ANY_ID, 0, 0, DEVICE_INTEL }, /* AMD8111 */
445
-
{ 0x1022, 0x7445, PCI_ANY_ID, PCI_ANY_ID, 0, 0, DEVICE_INTEL }, /* AMD768 */
446
-
{ 0x10b9, 0x5455, PCI_ANY_ID, PCI_ANY_ID, 0, 0, DEVICE_ALI }, /* Ali5455 */
424
+
{ PCI_VDEVICE(INTEL, 0x2415), DEVICE_INTEL }, /* 82801AA */
425
+
{ PCI_VDEVICE(INTEL, 0x2425), DEVICE_INTEL }, /* 82901AB */
426
+
{ PCI_VDEVICE(INTEL, 0x2445), DEVICE_INTEL }, /* 82801BA */
427
+
{ PCI_VDEVICE(INTEL, 0x2485), DEVICE_INTEL }, /* ICH3 */
428
+
{ PCI_VDEVICE(INTEL, 0x24c5), DEVICE_INTEL_ICH4 }, /* ICH4 */
429
+
{ PCI_VDEVICE(INTEL, 0x24d5), DEVICE_INTEL_ICH4 }, /* ICH5 */
430
+
{ PCI_VDEVICE(INTEL, 0x25a6), DEVICE_INTEL_ICH4 }, /* ESB */
431
+
{ PCI_VDEVICE(INTEL, 0x266e), DEVICE_INTEL_ICH4 }, /* ICH6 */
432
+
{ PCI_VDEVICE(INTEL, 0x27de), DEVICE_INTEL_ICH4 }, /* ICH7 */
433
+
{ PCI_VDEVICE(INTEL, 0x2698), DEVICE_INTEL_ICH4 }, /* ESB2 */
434
+
{ PCI_VDEVICE(INTEL, 0x7195), DEVICE_INTEL }, /* 440MX */
435
+
{ PCI_VDEVICE(SI, 0x7012), DEVICE_SIS }, /* SI7012 */
436
+
{ PCI_VDEVICE(NVIDIA, 0x01b1), DEVICE_NFORCE }, /* NFORCE */
437
+
{ PCI_VDEVICE(NVIDIA, 0x003a), DEVICE_NFORCE }, /* MCP04 */
438
+
{ PCI_VDEVICE(NVIDIA, 0x006a), DEVICE_NFORCE }, /* NFORCE2 */
439
+
{ PCI_VDEVICE(NVIDIA, 0x0059), DEVICE_NFORCE }, /* CK804 */
440
+
{ PCI_VDEVICE(NVIDIA, 0x008a), DEVICE_NFORCE }, /* CK8 */
441
+
{ PCI_VDEVICE(NVIDIA, 0x00da), DEVICE_NFORCE }, /* NFORCE3 */
442
+
{ PCI_VDEVICE(NVIDIA, 0x00ea), DEVICE_NFORCE }, /* CK8S */
443
+
{ PCI_VDEVICE(NVIDIA, 0x026b), DEVICE_NFORCE }, /* MCP51 */
444
+
{ PCI_VDEVICE(AMD, 0x746d), DEVICE_INTEL }, /* AMD8111 */
445
+
{ PCI_VDEVICE(AMD, 0x7445), DEVICE_INTEL }, /* AMD768 */
446
+
{ PCI_VDEVICE(AL, 0x5455), DEVICE_ALI }, /* Ali5455 */
447
447
{ 0, }
448
448
};
449
449
+17
-17
sound/pci/intel8x0m.c
+17
-17
sound/pci/intel8x0m.c
···
220
220
};
221
221
222
222
static struct pci_device_id snd_intel8x0m_ids[] = {
223
-
{ 0x8086, 0x2416, PCI_ANY_ID, PCI_ANY_ID, 0, 0, DEVICE_INTEL }, /* 82801AA */
224
-
{ 0x8086, 0x2426, PCI_ANY_ID, PCI_ANY_ID, 0, 0, DEVICE_INTEL }, /* 82901AB */
225
-
{ 0x8086, 0x2446, PCI_ANY_ID, PCI_ANY_ID, 0, 0, DEVICE_INTEL }, /* 82801BA */
226
-
{ 0x8086, 0x2486, PCI_ANY_ID, PCI_ANY_ID, 0, 0, DEVICE_INTEL }, /* ICH3 */
227
-
{ 0x8086, 0x24c6, PCI_ANY_ID, PCI_ANY_ID, 0, 0, DEVICE_INTEL }, /* ICH4 */
228
-
{ 0x8086, 0x24d6, PCI_ANY_ID, PCI_ANY_ID, 0, 0, DEVICE_INTEL }, /* ICH5 */
229
-
{ 0x8086, 0x266d, PCI_ANY_ID, PCI_ANY_ID, 0, 0, DEVICE_INTEL }, /* ICH6 */
230
-
{ 0x8086, 0x27dd, PCI_ANY_ID, PCI_ANY_ID, 0, 0, DEVICE_INTEL }, /* ICH7 */
231
-
{ 0x8086, 0x7196, PCI_ANY_ID, PCI_ANY_ID, 0, 0, DEVICE_INTEL }, /* 440MX */
232
-
{ 0x1022, 0x7446, PCI_ANY_ID, PCI_ANY_ID, 0, 0, DEVICE_INTEL }, /* AMD768 */
233
-
{ 0x1039, 0x7013, PCI_ANY_ID, PCI_ANY_ID, 0, 0, DEVICE_SIS }, /* SI7013 */
234
-
{ 0x10de, 0x01c1, PCI_ANY_ID, PCI_ANY_ID, 0, 0, DEVICE_NFORCE }, /* NFORCE */
235
-
{ 0x10de, 0x0069, PCI_ANY_ID, PCI_ANY_ID, 0, 0, DEVICE_NFORCE }, /* NFORCE2 */
236
-
{ 0x10de, 0x0089, PCI_ANY_ID, PCI_ANY_ID, 0, 0, DEVICE_NFORCE }, /* NFORCE2s */
237
-
{ 0x10de, 0x00d9, PCI_ANY_ID, PCI_ANY_ID, 0, 0, DEVICE_NFORCE }, /* NFORCE3 */
223
+
{ PCI_VDEVICE(INTEL, 0x2416), DEVICE_INTEL }, /* 82801AA */
224
+
{ PCI_VDEVICE(INTEL, 0x2426), DEVICE_INTEL }, /* 82901AB */
225
+
{ PCI_VDEVICE(INTEL, 0x2446), DEVICE_INTEL }, /* 82801BA */
226
+
{ PCI_VDEVICE(INTEL, 0x2486), DEVICE_INTEL }, /* ICH3 */
227
+
{ PCI_VDEVICE(INTEL, 0x24c6), DEVICE_INTEL }, /* ICH4 */
228
+
{ PCI_VDEVICE(INTEL, 0x24d6), DEVICE_INTEL }, /* ICH5 */
229
+
{ PCI_VDEVICE(INTEL, 0x266d), DEVICE_INTEL }, /* ICH6 */
230
+
{ PCI_VDEVICE(INTEL, 0x27dd), DEVICE_INTEL }, /* ICH7 */
231
+
{ PCI_VDEVICE(INTEL, 0x7196), DEVICE_INTEL }, /* 440MX */
232
+
{ PCI_VDEVICE(AMD, 0x7446), DEVICE_INTEL }, /* AMD768 */
233
+
{ PCI_VDEVICE(SI, 0x7013), DEVICE_SIS }, /* SI7013 */
234
+
{ PCI_VDEVICE(NVIDIA, 0x01c1), DEVICE_NFORCE }, /* NFORCE */
235
+
{ PCI_VDEVICE(NVIDIA, 0x0069), DEVICE_NFORCE }, /* NFORCE2 */
236
+
{ PCI_VDEVICE(NVIDIA, 0x0089), DEVICE_NFORCE }, /* NFORCE2s */
237
+
{ PCI_VDEVICE(NVIDIA, 0x00d9), DEVICE_NFORCE }, /* NFORCE3 */
238
238
#if 0
239
-
{ 0x1022, 0x746d, PCI_ANY_ID, PCI_ANY_ID, 0, 0, DEVICE_INTEL }, /* AMD8111 */
240
-
{ 0x10b9, 0x5455, PCI_ANY_ID, PCI_ANY_ID, 0, 0, DEVICE_ALI }, /* Ali5455 */
239
+
{ PCI_VDEVICE(AMD, 0x746d), DEVICE_INTEL }, /* AMD8111 */
240
+
{ PCI_VDEVICE(AL, 0x5455), DEVICE_ALI }, /* Ali5455 */
241
241
#endif
242
242
{ 0, }
243
243
};
+1
-1
sound/pci/mixart/mixart.c
+1
-1
sound/pci/mixart/mixart.c
+3
-3
sound/pci/nm256/nm256.c
+3
-3
sound/pci/nm256/nm256.c
···
263
263
* PCI ids
264
264
*/
265
265
static struct pci_device_id snd_nm256_ids[] = {
266
-
{PCI_VENDOR_ID_NEOMAGIC, PCI_DEVICE_ID_NEOMAGIC_NM256AV_AUDIO, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
267
-
{PCI_VENDOR_ID_NEOMAGIC, PCI_DEVICE_ID_NEOMAGIC_NM256ZX_AUDIO, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
268
-
{PCI_VENDOR_ID_NEOMAGIC, PCI_DEVICE_ID_NEOMAGIC_NM256XL_PLUS_AUDIO, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
266
+
{PCI_VDEVICE(NEOMAGIC, PCI_DEVICE_ID_NEOMAGIC_NM256AV_AUDIO), 0},
267
+
{PCI_VDEVICE(NEOMAGIC, PCI_DEVICE_ID_NEOMAGIC_NM256ZX_AUDIO), 0},
268
+
{PCI_VDEVICE(NEOMAGIC, PCI_DEVICE_ID_NEOMAGIC_NM256XL_PLUS_AUDIO), 0},
269
269
{0,},
270
270
};
271
271
+3
-6
sound/pci/rme32.c
+3
-6
sound/pci/rme32.c
···
227
227
};
228
228
229
229
static struct pci_device_id snd_rme32_ids[] = {
230
-
{PCI_VENDOR_ID_XILINX_RME, PCI_DEVICE_ID_RME_DIGI32,
231
-
PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0,},
232
-
{PCI_VENDOR_ID_XILINX_RME, PCI_DEVICE_ID_RME_DIGI32_8,
233
-
PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0,},
234
-
{PCI_VENDOR_ID_XILINX_RME, PCI_DEVICE_ID_RME_DIGI32_PRO,
235
-
PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0,},
230
+
{PCI_VDEVICE(XILINX_RME, PCI_DEVICE_ID_RME_DIGI32), 0,},
231
+
{PCI_VDEVICE(XILINX_RME, PCI_DEVICE_ID_RME_DIGI32_8), 0,},
232
+
{PCI_VDEVICE(XILINX_RME, PCI_DEVICE_ID_RME_DIGI32_PRO), 0,},
236
233
{0,}
237
234
};
238
235
+4
-8
sound/pci/rme96.c
+4
-8
sound/pci/rme96.c
···
232
232
};
233
233
234
234
static struct pci_device_id snd_rme96_ids[] = {
235
-
{ PCI_VENDOR_ID_XILINX, PCI_DEVICE_ID_RME_DIGI96,
236
-
PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0, },
237
-
{ PCI_VENDOR_ID_XILINX, PCI_DEVICE_ID_RME_DIGI96_8,
238
-
PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0, },
239
-
{ PCI_VENDOR_ID_XILINX, PCI_DEVICE_ID_RME_DIGI96_8_PRO,
240
-
PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0, },
241
-
{ PCI_VENDOR_ID_XILINX, PCI_DEVICE_ID_RME_DIGI96_8_PAD_OR_PST,
242
-
PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0, },
235
+
{ PCI_VDEVICE(XILINX, PCI_DEVICE_ID_RME_DIGI96), 0, },
236
+
{ PCI_VDEVICE(XILINX, PCI_DEVICE_ID_RME_DIGI96_8), 0, },
237
+
{ PCI_VDEVICE(XILINX, PCI_DEVICE_ID_RME_DIGI96_8_PRO), 0, },
238
+
{ PCI_VDEVICE(XILINX, PCI_DEVICE_ID_RME_DIGI96_8_PAD_OR_PST), 0, },
243
239
{ 0, }
244
240
};
245
241
+1
-1
sound/pci/sonicvibes.c
+1
-1
sound/pci/sonicvibes.c
+2
-2
sound/pci/via82xx.c
+2
-2
sound/pci/via82xx.c
···
402
402
403
403
static struct pci_device_id snd_via82xx_ids[] = {
404
404
/* 0x1106, 0x3058 */
405
-
{ PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_82C686_5, PCI_ANY_ID, PCI_ANY_ID, 0, 0, TYPE_CARD_VIA686, }, /* 686A */
405
+
{ PCI_VDEVICE(VIA, PCI_DEVICE_ID_VIA_82C686_5), TYPE_CARD_VIA686, }, /* 686A */
406
406
/* 0x1106, 0x3059 */
407
-
{ PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_8233_5, PCI_ANY_ID, PCI_ANY_ID, 0, 0, TYPE_CARD_VIA8233, }, /* VT8233 */
407
+
{ PCI_VDEVICE(VIA, PCI_DEVICE_ID_VIA_8233_5), TYPE_CARD_VIA8233, }, /* VT8233 */
408
408
{ 0, }
409
409
};
410
410
+1
-1
sound/pci/via82xx_modem.c
+1
-1
sound/pci/via82xx_modem.c
+6
-6
sound/pci/ymfpci/ymfpci.c
+6
-6
sound/pci/ymfpci/ymfpci.c
···
67
67
MODULE_PARM_DESC(rear_switch, "Enable shared rear/line-in switch");
68
68
69
69
static struct pci_device_id snd_ymfpci_ids[] = {
70
-
{ 0x1073, 0x0004, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0, }, /* YMF724 */
71
-
{ 0x1073, 0x000d, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0, }, /* YMF724F */
72
-
{ 0x1073, 0x000a, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0, }, /* YMF740 */
73
-
{ 0x1073, 0x000c, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0, }, /* YMF740C */
74
-
{ 0x1073, 0x0010, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0, }, /* YMF744 */
75
-
{ 0x1073, 0x0012, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0, }, /* YMF754 */
70
+
{ PCI_VDEVICE(YAMAHA, 0x0004), 0, }, /* YMF724 */
71
+
{ PCI_VDEVICE(YAMAHA, 0x000d), 0, }, /* YMF724F */
72
+
{ PCI_VDEVICE(YAMAHA, 0x000a), 0, }, /* YMF740 */
73
+
{ PCI_VDEVICE(YAMAHA, 0x000c), 0, }, /* YMF740C */
74
+
{ PCI_VDEVICE(YAMAHA, 0x0010), 0, }, /* YMF744 */
75
+
{ PCI_VDEVICE(YAMAHA, 0x0012), 0, }, /* YMF754 */
76
76
{ 0, }
77
77
};
78
78