Eric Lee / smarc-ti-linux-kernel

Download as
Browse Code ยป

Commit 28d27aae9432c300857722a917be4065c6d7abff

Authored by Joe Perches
Committed by Takashi Iwai
1 parent 28d0325ce6

sound: Use PCI_VDEVICE 

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

Showing 23 changed files with 86 additions and 96 deletions Side-by-side Diff

... ... @@ -199,7 +199,7 @@
199 199 */
200 200  
201 201 static struct pci_device_id id_tbl[] = {
202   - { PCI_VENDOR_ID_CYRIX, PCI_DEVICE_ID_CYRIX_5530_AUDIO, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },
  202 + { PCI_VDEVICE(CYRIX, PCI_DEVICE_ID_CYRIX_5530_AUDIO), 0 },
203 203 { }
204 204 };
205 205  
... ... @@ -287,10 +287,10 @@
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  
sound/pci/atiixp_modem.c
Diff comments   View file @ 28d27aa
... ... @@ -262,8 +262,8 @@
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  
sound/pci/au88x0/au8810.c
Diff comments   View file @ 28d27aa
1 1 #include "au8810.h"
2 2 #include "au88x0.h"
3 3 static struct pci_device_id snd_vortex_ids[] = {
4   - {PCI_VENDOR_ID_AUREAL, PCI_DEVICE_ID_AUREAL_ADVANTAGE,
5   - PCI_ANY_ID, PCI_ANY_ID, 0, 0, 1,},
  4 + {PCI_VDEVICE(AUREAL, PCI_DEVICE_ID_AUREAL_ADVANTAGE), 1,},
6 5 {0,}
7 6 };
8 7  
sound/pci/au88x0/au8820.c
Diff comments   View file @ 28d27aa
1 1 #include "au8820.h"
2 2 #include "au88x0.h"
3 3 static struct pci_device_id snd_vortex_ids[] = {
4   - {PCI_VENDOR_ID_AUREAL, PCI_DEVICE_ID_AUREAL_VORTEX_1,
5   - PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0,},
  4 + {PCI_VDEVICE(AUREAL, PCI_DEVICE_ID_AUREAL_VORTEX_1), 0,},
6 5 {0,}
7 6 };
8 7  
sound/pci/au88x0/au8830.c
Diff comments   View file @ 28d27aa
1 1 #include "au8830.h"
2 2 #include "au88x0.h"
3 3 static struct pci_device_id snd_vortex_ids[] = {
4   - {PCI_VENDOR_ID_AUREAL, PCI_DEVICE_ID_AUREAL_VORTEX_2,
5   - PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0,},
  4 + {PCI_VDEVICE(AUREAL, PCI_DEVICE_ID_AUREAL_VORTEX_2), 0,},
6 5 {0,}
7 6 };
8 7  
... ... @@ -2797,11 +2797,11 @@
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  
... ... @@ -495,7 +495,7 @@
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  
sound/pci/cs46xx/cs46xx.c
Diff comments   View file @ 28d27aa
... ... @@ -65,9 +65,9 @@
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  
... ... @@ -445,11 +445,11 @@
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 */
  451 + { PCI_VDEVICE(ENSONIQ, 0x1371), 0, }, /* ES1371 */
  452 + { PCI_VDEVICE(ENSONIQ, 0x5880), 0, }, /* ES1373 - CT5880 */
453 453 { 0x1102, 0x8938, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0, }, /* Ectiva EV1938 */
454 454 #endif
455 455 { 0, }
... ... @@ -244,7 +244,7 @@
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  
sound/pci/ice1712/ice1712.c
Diff comments   View file @ 28d27aa
... ... @@ -107,7 +107,7 @@
107 107  
108 108  
109 109 static const struct pci_device_id snd_ice1712_ids[] = {
110   - { PCI_VENDOR_ID_ICE, PCI_DEVICE_ID_ICE_1712, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 }, /* ICE1712 */
  110 + { PCI_VDEVICE(ICE, PCI_DEVICE_ID_ICE_1712), 0 }, /* ICE1712 */
111 111 { 0, }
112 112 };
113 113  
sound/pci/ice1712/ice1724.c
Diff comments   View file @ 28d27aa
... ... @@ -93,7 +93,7 @@
93 93  
94 94 /* Both VT1720 and VT1724 have the same PCI IDs */
95 95 static const struct pci_device_id snd_vt1724_ids[] = {
96   - { PCI_VENDOR_ID_ICE, PCI_DEVICE_ID_VT1724, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },
  96 + { PCI_VDEVICE(ICE, PCI_DEVICE_ID_VT1724), 0 },
97 97 { 0, }
98 98 };
99 99  
sound/pci/intel8x0.c
Diff comments   View file @ 28d27aa
... ... @@ -421,29 +421,29 @@
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  
sound/pci/intel8x0m.c
Diff comments   View file @ 28d27aa
... ... @@ -220,24 +220,24 @@
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 };
sound/pci/mixart/mixart.c
Diff comments   View file @ 28d27aa
... ... @@ -61,7 +61,7 @@
61 61 */
62 62  
63 63 static struct pci_device_id snd_mixart_ids[] = {
64   - { 0x1057, 0x0003, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0, }, /* MC8240 */
  64 + { PCI_VDEVICE(MOTOROLA, 0x0003), 0, }, /* MC8240 */
65 65 { 0, }
66 66 };
67 67  
sound/pci/nm256/nm256.c
Diff comments   View file @ 28d27aa
... ... @@ -263,9 +263,9 @@
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  
... ... @@ -227,12 +227,9 @@
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  
... ... @@ -232,14 +232,10 @@
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  
sound/pci/sonicvibes.c
Diff comments   View file @ 28d27aa
... ... @@ -243,7 +243,7 @@
243 243 };
244 244  
245 245 static struct pci_device_id snd_sonic_ids[] = {
246   - { 0x5333, 0xca00, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0, },
  246 + { PCI_VDEVICE(S3, 0xca00), 0, },
247 247 { 0, }
248 248 };
249 249  
... ... @@ -402,9 +402,9 @@
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  
sound/pci/via82xx_modem.c
Diff comments   View file @ 28d27aa
... ... @@ -261,7 +261,7 @@
261 261 };
262 262  
263 263 static struct pci_device_id snd_via82xx_modem_ids[] = {
264   - { 0x1106, 0x3068, PCI_ANY_ID, PCI_ANY_ID, 0, 0, TYPE_CARD_VIA82XX_MODEM, },
  264 + { PCI_VDEVICE(VIA, 0x3068), TYPE_CARD_VIA82XX_MODEM, },
265 265 { 0, }
266 266 };
267 267  
sound/pci/ymfpci/ymfpci.c
Diff comments   View file @ 28d27aa
... ... @@ -67,12 +67,12 @@
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