Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 8cdfd2519c6c9a1e6057dc5970b2542b35895738

Authored by Takashi Iwai
Committed by Jaroslav Kysela
1 parent df8db936e5
Exists in master and in 39 other branches 8mp-imx_5.4.70_2.3.0, 8qm-imx_5.4.70_2.3.0, emb_imx_lf-5.15.y, emb_lf-6.1.y, 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, imx_4.1.15_1.0.0_ga, pitx_8mp_lf-5.10.y, rt-smarc-imx_4.1.15_1.0.0_ga, rt_linux_5.15.71, smarc-8m-android-11.0.0_2.0.0, smarc-imx6_4.14.98_2.0.0_ga, smarc-imx6_4.9.88_2.0.0_ga, smarc-imx7_4.14.98_2.0.0_ga, smarc-imx7_4.9.11_1.0.0_ga, smarc-imx7_4.9.88_2.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-imx_4.1.15_1.0.0_ga, smarc-imx_4.9.11_1.0.0_ga, smarc-imx_4.9.51_imx8m_ga, smarc-imx_4.9.88_2.0.0_ga, smarc-m6.0.1_2.1.0-ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_1.2.0_ga, smarc_8m_00d0_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.14.78_1.0.0_ga, smarc_8m_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.19.35_1.1.0, smarc_8mm_imx_4.14.78_1.0.0_ga, smarc_8mm_imx_4.14.98_2.0.0_ga, smarc_8mm_imx_4.19.35_1.1.0, smarc_8mm_imx_5.4.24_2.1.0, smarc_8mp_lf-5.10.y, smarc_8mq_imx_5.4.24_2.1.0, smarc_8mq_lf-5.10.y, smarc_imx_lf-5.15.y

[ALSA] Remove superfluous PCI ID definitions 

CS46xx driver,EMU10K1/EMU10K2 driver,PCM Midlevel,Trident driver
YMFPCI driver,BT87x driver,CMIPCI driver,CS4281 driver
ENS1370/1+ driver,ES1938 driver,ES1968 driver,Intel8x0 driver
Intel8x0-modem driver,Maestro3 driver,RME32 driver,RME96 driver
SonicVibes driver,VIA82xx driver,ALI5451 driver,ICE1712 driver
ICE1724 driver,NM256 driver,RME HDSP driver,RME9652 driver
Remove superfluous PCI ID definitions.

Signed-off-by: Takashi Iwai <tiwai@suse.de>

Showing 26 changed files with 17 additions and 405 deletions Side-by-side Diff

include/sound/cs46xx.h
Diff comments   View file @ 8cdfd25
... ... @@ -29,19 +29,6 @@
29 29 #include "ac97_codec.h"
30 30 #include "cs46xx_dsp_spos.h"
31 31  
32   -#ifndef PCI_VENDOR_ID_CIRRUS
33   -#define PCI_VENDOR_ID_CIRRUS 0x1013
34   -#endif
35   -#ifndef PCI_DEVICE_ID_CIRRUS_4610
36   -#define PCI_DEVICE_ID_CIRRUS_4610 0x6001
37   -#endif
38   -#ifndef PCI_DEVICE_ID_CIRRUS_4612
39   -#define PCI_DEVICE_ID_CIRRUS_4612 0x6003
40   -#endif
41   -#ifndef PCI_DEVICE_ID_CIRRUS_4615
42   -#define PCI_DEVICE_ID_CIRRUS_4615 0x6004
43   -#endif
44   -
45 32 /*
46 33 * Direct registers
47 34 */
include/sound/emu10k1.h
Diff comments   View file @ 8cdfd25
... ... @@ -35,13 +35,6 @@
35 35 #include <linux/interrupt.h>
36 36 #include <asm/io.h>
37 37  
38   -#ifndef PCI_VENDOR_ID_CREATIVE
39   -#define PCI_VENDOR_ID_CREATIVE 0x1102
40   -#endif
41   -#ifndef PCI_DEVICE_ID_CREATIVE_EMU10K1
42   -#define PCI_DEVICE_ID_CREATIVE_EMU10K1 0x0002
43   -#endif
44   -
45 38 /* ------------------- DEFINES -------------------- */
46 39  
47 40 #define EMUPAGESIZE 4096
... ... @@ -910,6 +910,7 @@
910 910 * Returns 1 if the given PCM format is CPU-endian, 0 if
911 911 * opposite, or a negative error code if endian not specified.
912 912 */
  913 +int snd_pcm_format_cpu_endian(snd_pcm_format_t format);
913 914 #ifdef SNDRV_LITTLE_ENDIAN
914 915 #define snd_pcm_format_cpu_endian(format) snd_pcm_format_little_endian(format)
915 916 #else
include/sound/trident.h
Diff comments   View file @ 8cdfd25
... ... @@ -33,23 +33,6 @@
33 33 //#include "ainstr_gf1.h"
34 34 #include "ainstr_simple.h"
35 35  
36   -#ifndef PCI_VENDOR_ID_TRIDENT
37   -#define PCI_VENDOR_ID_TRIDENT 0x1023
38   -#endif
39   -#ifndef PCI_DEVICE_ID_TRIDENT_4DWAVE_DX
40   -#define PCI_DEVICE_ID_TRIDENT_4DWAVE_DX 0x2000
41   -#endif
42   -#ifndef PCI_DEVICE_ID_TRIDENT_4DWAVE_NX
43   -#define PCI_DEVICE_ID_TRIDENT_4DWAVE_NX 0x2001
44   -#endif
45   -
46   -#ifndef PCI_VENDOR_ID_SI
47   -#define PCI_VENDOR_ID_SI 0x1039
48   -#endif
49   -#ifndef PCI_DEVICE_ID_SI_7018
50   -#define PCI_DEVICE_ID_SI_7018 0x7018
51   -#endif
52   -
53 36 #define TRIDENT_DEVICE_ID_DX ((PCI_VENDOR_ID_TRIDENT<<16)|PCI_DEVICE_ID_TRIDENT_4DWAVE_DX)
54 37 #define TRIDENT_DEVICE_ID_NX ((PCI_VENDOR_ID_TRIDENT<<16)|PCI_DEVICE_ID_TRIDENT_4DWAVE_NX)
55 38 #define TRIDENT_DEVICE_ID_SI7018 ((PCI_VENDOR_ID_SI<<16)|PCI_DEVICE_ID_SI_7018)
include/sound/ymfpci.h
Diff comments   View file @ 8cdfd25
... ... @@ -28,28 +28,6 @@
28 28 #include "timer.h"
29 29 #include <linux/gameport.h>
30 30  
31   -#ifndef PCI_VENDOR_ID_YAMAHA
32   -#define PCI_VENDOR_ID_YAMAHA 0x1073
33   -#endif
34   -#ifndef PCI_DEVICE_ID_YAMAHA_724
35   -#define PCI_DEVICE_ID_YAMAHA_724 0x0004
36   -#endif
37   -#ifndef PCI_DEVICE_ID_YAMAHA_724F
38   -#define PCI_DEVICE_ID_YAMAHA_724F 0x000d
39   -#endif
40   -#ifndef PCI_DEVICE_ID_YAMAHA_740
41   -#define PCI_DEVICE_ID_YAMAHA_740 0x000a
42   -#endif
43   -#ifndef PCI_DEVICE_ID_YAMAHA_740C
44   -#define PCI_DEVICE_ID_YAMAHA_740C 0x000c
45   -#endif
46   -#ifndef PCI_DEVICE_ID_YAMAHA_744
47   -#define PCI_DEVICE_ID_YAMAHA_744 0x0010
48   -#endif
49   -#ifndef PCI_DEVICE_ID_YAMAHA_754
50   -#define PCI_DEVICE_ID_YAMAHA_754 0x0012
51   -#endif
52   -
53 31 /*
54 32 * Direct registers
55 33 */
sound/pci/ali5451/ali5451.c
Diff comments   View file @ 8cdfd25
... ... @@ -78,15 +78,7 @@
78 78 * Constants definition
79 79 */
80 80  
81   -#ifndef PCI_VENDOR_ID_ALI
82   -#define PCI_VENDOR_ID_ALI 0x10b9
83   -#endif
84   -
85   -#ifndef PCI_DEVICE_ID_ALI_5451
86   -#define PCI_DEVICE_ID_ALI_5451 0x5451
87   -#endif
88   -
89   -#define DEVICE_ID_ALI5451 ((PCI_VENDOR_ID_ALI<<16)|PCI_DEVICE_ID_ALI_5451)
  81 +#define DEVICE_ID_ALI5451 ((PCI_VENDOR_ID_AL<<16)|PCI_DEVICE_ID_AL_M5451)
90 82  
91 83  
92 84 #define ALI_CHANNELS 32
... ... @@ -59,16 +59,6 @@
59 59 MODULE_PARM_DESC(load_all, "Allow to load the non-whitelisted cards");
60 60  
61 61  
62   -#ifndef PCI_VENDOR_ID_BROOKTREE
63   -#define PCI_VENDOR_ID_BROOKTREE 0x109e
64   -#endif
65   -#ifndef PCI_DEVICE_ID_BROOKTREE_878
66   -#define PCI_DEVICE_ID_BROOKTREE_878 0x0878
67   -#endif
68   -#ifndef PCI_DEVICE_ID_BROOKTREE_879
69   -#define PCI_DEVICE_ID_BROOKTREE_879 0x0879
70   -#endif
71   -
72 62 /* register offsets */
73 63 #define REG_INT_STAT 0x100 /* interrupt status */
74 64 #define REG_INT_MASK 0x104 /* interrupt mask */
... ... @@ -79,13 +79,6 @@
79 79 MODULE_PARM_DESC(joystick_port, "Joystick port address.");
80 80 #endif
81 81  
82   -#ifndef PCI_DEVICE_ID_CMEDIA_CM8738
83   -#define PCI_DEVICE_ID_CMEDIA_CM8738 0x0111
84   -#endif
85   -#ifndef PCI_DEVICE_ID_CMEDIA_CM8738B
86   -#define PCI_DEVICE_ID_CMEDIA_CM8738B 0x0112
87   -#endif
88   -
89 82 /*
90 83 * CM8x38 registers definition
91 84 */
... ... @@ -346,25 +339,6 @@
346 339 #define CM_EXTENT_MIDI 0x2
347 340 #define CM_EXTENT_SYNTH 0x4
348 341  
349   -
350   -/*
351   - * pci ids
352   - */
353   -#ifndef PCI_VENDOR_ID_CMEDIA
354   -#define PCI_VENDOR_ID_CMEDIA 0x13F6
355   -#endif
356   -#ifndef PCI_DEVICE_ID_CMEDIA_CM8338A
357   -#define PCI_DEVICE_ID_CMEDIA_CM8338A 0x0100
358   -#endif
359   -#ifndef PCI_DEVICE_ID_CMEDIA_CM8338B
360   -#define PCI_DEVICE_ID_CMEDIA_CM8338B 0x0101
361   -#endif
362   -#ifndef PCI_DEVICE_ID_CMEDIA_CM8738
363   -#define PCI_DEVICE_ID_CMEDIA_CM8738 0x0111
364   -#endif
365   -#ifndef PCI_DEVICE_ID_CMEDIA_CM8738B
366   -#define PCI_DEVICE_ID_CMEDIA_CM8738B 0x0112
367   -#endif
368 342  
369 343 /*
370 344 * channels for playback / capture
... ... @@ -57,17 +57,6 @@
57 57 MODULE_PARM_DESC(dual_codec, "Secondary Codec ID (0 = disabled).");
58 58  
59 59 /*
60   - *
61   - */
62   -
63   -#ifndef PCI_VENDOR_ID_CIRRUS
64   -#define PCI_VENDOR_ID_CIRRUS 0x1013
65   -#endif
66   -#ifndef PCI_DEVICE_ID_CIRRUS_4281
67   -#define PCI_DEVICE_ID_CIRRUS_4281 0x6005
68   -#endif
69   -
70   -/*
71 60 * Direct registers
72 61 */
73 62  
sound/pci/cs46xx/cs46xx_lib.c
Diff comments   View file @ 8cdfd25
... ... @@ -3525,17 +3525,6 @@
3525 3525  
3526 3526  
3527 3527 /*
3528   - * piix4 pci ids
3529   - */
3530   -#ifndef PCI_VENDOR_ID_INTEL
3531   -#define PCI_VENDOR_ID_INTEL 0x8086
3532   -#endif /* PCI_VENDOR_ID_INTEL */
3533   -
3534   -#ifndef PCI_DEVICE_ID_INTEL_82371AB_3
3535   -#define PCI_DEVICE_ID_INTEL_82371AB_3 0x7113
3536   -#endif /* PCI_DEVICE_ID_INTEL_82371AB_3 */
3537   -
3538   -/*
3539 3528 * Handle the CLKRUN on a thinkpad. We must disable CLKRUN support
3540 3529 * whenever we need to beat on the chip.
3541 3530 *
... ... @@ -100,13 +100,6 @@
100 100 #endif
101 101 #endif /* SUPPORT_JOYSTICK */
102 102  
103   -#ifndef PCI_DEVICE_ID_ENSONIQ_CT5880
104   -#define PCI_DEVICE_ID_ENSONIQ_CT5880 0x5880
105   -#endif
106   -#ifndef PCI_DEVICE_ID_ENSONIQ_ES1371
107   -#define PCI_DEVICE_ID_ENSONIQ_ES1371 0x1371
108   -#endif
109   -
110 103 /* ES1371 chip ID */
111 104 /* This is a little confusing because all ES1371 compatible chips have the
112 105 same DEVICE_ID, the only thing differentiating them is the REV_ID field.
... ... @@ -76,13 +76,6 @@
76 76 #define SUPPORT_JOYSTICK 1
77 77 #endif
78 78  
79   -#ifndef PCI_VENDOR_ID_ESS
80   -#define PCI_VENDOR_ID_ESS 0x125d
81   -#endif
82   -#ifndef PCI_DEVICE_ID_ESS_ES1938
83   -#define PCI_DEVICE_ID_ESS_ES1938 0x1969
84   -#endif
85   -
86 79 static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX; /* Index 0-MAX */
87 80 static char *id[SNDRV_CARDS] = SNDRV_DEFAULT_STR; /* ID for this card */
88 81 static int enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_PNP; /* Enable this card */
... ... @@ -160,25 +160,6 @@
160 160 #endif
161 161  
162 162  
163   -/* PCI Dev ID's */
164   -
165   -#ifndef PCI_VENDOR_ID_ESS
166   -#define PCI_VENDOR_ID_ESS 0x125D
167   -#endif
168   -
169   -#define PCI_VENDOR_ID_ESS_OLD 0x1285 /* Platform Tech, the people the ESS
170   - was bought form */
171   -
172   -#ifndef PCI_DEVICE_ID_ESS_M2E
173   -#define PCI_DEVICE_ID_ESS_M2E 0x1978
174   -#endif
175   -#ifndef PCI_DEVICE_ID_ESS_M2
176   -#define PCI_DEVICE_ID_ESS_M2 0x1968
177   -#endif
178   -#ifndef PCI_DEVICE_ID_ESS_M1
179   -#define PCI_DEVICE_ID_ESS_M1 0x0100
180   -#endif
181   -
182 163 #define NR_APUS 64
183 164 #define NR_APU_REGS 16
184 165  
sound/pci/ice1712/ice1712.c
Diff comments   View file @ 8cdfd25
... ... @@ -100,12 +100,6 @@
100 100 module_param_array(model, charp, NULL, 0444);
101 101 MODULE_PARM_DESC(model, "Use the given board model.");
102 102  
103   -#ifndef PCI_VENDOR_ID_ICE
104   -#define PCI_VENDOR_ID_ICE 0x1412
105   -#endif
106   -#ifndef PCI_DEVICE_ID_ICE_1712
107   -#define PCI_DEVICE_ID_ICE_1712 0x1712
108   -#endif
109 103  
110 104 static struct pci_device_id snd_ice1712_ids[] = {
111 105 { PCI_VENDOR_ID_ICE, PCI_DEVICE_ID_ICE_1712, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 }, /* ICE1712 */
sound/pci/ice1712/ice1724.c
Diff comments   View file @ 8cdfd25
... ... @@ -83,12 +83,6 @@
83 83 module_param_array(model, charp, NULL, 0444);
84 84 MODULE_PARM_DESC(model, "Use the given board model.");
85 85  
86   -#ifndef PCI_VENDOR_ID_ICE
87   -#define PCI_VENDOR_ID_ICE 0x1412
88   -#endif
89   -#ifndef PCI_DEVICE_ID_VT1724
90   -#define PCI_DEVICE_ID_VT1724 0x1724
91   -#endif
92 86  
93 87 /* Both VT1720 and VT1724 have the same PCI IDs */
94 88 static struct pci_device_id snd_vt1724_ids[] = {
sound/pci/intel8x0.c
Diff comments   View file @ 8cdfd25
... ... @@ -94,62 +94,6 @@
94 94 /*
95 95 * Direct registers
96 96 */
97   -
98   -#ifndef PCI_DEVICE_ID_INTEL_82801
99   -#define PCI_DEVICE_ID_INTEL_82801 0x2415
100   -#endif
101   -#ifndef PCI_DEVICE_ID_INTEL_82901
102   -#define PCI_DEVICE_ID_INTEL_82901 0x2425
103   -#endif
104   -#ifndef PCI_DEVICE_ID_INTEL_82801BA
105   -#define PCI_DEVICE_ID_INTEL_82801BA 0x2445
106   -#endif
107   -#ifndef PCI_DEVICE_ID_INTEL_440MX
108   -#define PCI_DEVICE_ID_INTEL_440MX 0x7195
109   -#endif
110   -#ifndef PCI_DEVICE_ID_INTEL_ICH3
111   -#define PCI_DEVICE_ID_INTEL_ICH3 0x2485
112   -#endif
113   -#ifndef PCI_DEVICE_ID_INTEL_ICH4
114   -#define PCI_DEVICE_ID_INTEL_ICH4 0x24c5
115   -#endif
116   -#ifndef PCI_DEVICE_ID_INTEL_ICH5
117   -#define PCI_DEVICE_ID_INTEL_ICH5 0x24d5
118   -#endif
119   -#ifndef PCI_DEVICE_ID_INTEL_ESB_5
120   -#define PCI_DEVICE_ID_INTEL_ESB_5 0x25a6
121   -#endif
122   -#ifndef PCI_DEVICE_ID_INTEL_ICH6_18
123   -#define PCI_DEVICE_ID_INTEL_ICH6_18 0x266e
124   -#endif
125   -#ifndef PCI_DEVICE_ID_INTEL_ICH7_20
126   -#define PCI_DEVICE_ID_INTEL_ICH7_20 0x27de
127   -#endif
128   -#ifndef PCI_DEVICE_ID_INTEL_ESB2_14
129   -#define PCI_DEVICE_ID_INTEL_ESB2_14 0x2698
130   -#endif
131   -#ifndef PCI_DEVICE_ID_SI_7012
132   -#define PCI_DEVICE_ID_SI_7012 0x7012
133   -#endif
134   -#ifndef PCI_DEVICE_ID_NVIDIA_MCP_AUDIO
135   -#define PCI_DEVICE_ID_NVIDIA_MCP_AUDIO 0x01b1
136   -#endif
137   -#ifndef PCI_DEVICE_ID_NVIDIA_CK804_AUDIO
138   -#define PCI_DEVICE_ID_NVIDIA_CK804_AUDIO 0x0059
139   -#endif
140   -#ifndef PCI_DEVICE_ID_NVIDIA_MCP2_AUDIO
141   -#define PCI_DEVICE_ID_NVIDIA_MCP2_AUDIO 0x006a
142   -#endif
143   -#ifndef PCI_DEVICE_ID_NVIDIA_CK8_AUDIO
144   -#define PCI_DEVICE_ID_NVIDIA_CK8_AUDIO 0x008a
145   -#endif
146   -#ifndef PCI_DEVICE_ID_NVIDIA_MCP3_AUDIO
147   -#define PCI_DEVICE_ID_NVIDIA_MCP3_AUDIO 0x00da
148   -#endif
149   -#ifndef PCI_DEVICE_ID_NVIDIA_CK8S_AUDIO
150   -#define PCI_DEVICE_ID_NVIDIA_CK8S_AUDIO 0x00ea
151   -#endif
152   -
153 97 enum { DEVICE_INTEL, DEVICE_INTEL_ICH4, DEVICE_SIS, DEVICE_ALI, DEVICE_NFORCE };
154 98  
155 99 #define ICHREG(x) ICH_REG_##x
156 100  
157 101  
... ... @@ -2801,19 +2745,19 @@
2801 2745 unsigned int id;
2802 2746 const char *s;
2803 2747 } shortnames[] __devinitdata = {
2804   - { PCI_DEVICE_ID_INTEL_82801, "Intel 82801AA-ICH" },
2805   - { PCI_DEVICE_ID_INTEL_82901, "Intel 82901AB-ICH0" },
2806   - { PCI_DEVICE_ID_INTEL_82801BA, "Intel 82801BA-ICH2" },
  2748 + { PCI_DEVICE_ID_INTEL_82801AA_5, "Intel 82801AA-ICH" },
  2749 + { PCI_DEVICE_ID_INTEL_82801AB_5, "Intel 82901AB-ICH0" },
  2750 + { PCI_DEVICE_ID_INTEL_82801BA_4, "Intel 82801BA-ICH2" },
2807 2751 { PCI_DEVICE_ID_INTEL_440MX, "Intel 440MX" },
2808   - { PCI_DEVICE_ID_INTEL_ICH3, "Intel 82801CA-ICH3" },
2809   - { PCI_DEVICE_ID_INTEL_ICH4, "Intel 82801DB-ICH4" },
2810   - { PCI_DEVICE_ID_INTEL_ICH5, "Intel ICH5" },
  2752 + { PCI_DEVICE_ID_INTEL_82801CA_5, "Intel 82801CA-ICH3" },
  2753 + { PCI_DEVICE_ID_INTEL_82801DB_5, "Intel 82801DB-ICH4" },
  2754 + { PCI_DEVICE_ID_INTEL_82801EB_5, "Intel ICH5" },
2811 2755 { PCI_DEVICE_ID_INTEL_ESB_5, "Intel 6300ESB" },
2812 2756 { PCI_DEVICE_ID_INTEL_ICH6_18, "Intel ICH6" },
2813 2757 { PCI_DEVICE_ID_INTEL_ICH7_20, "Intel ICH7" },
2814 2758 { PCI_DEVICE_ID_INTEL_ESB2_14, "Intel ESB2" },
2815 2759 { PCI_DEVICE_ID_SI_7012, "SiS SI7012" },
2816   - { PCI_DEVICE_ID_NVIDIA_MCP_AUDIO, "NVidia nForce" },
  2760 + { PCI_DEVICE_ID_NVIDIA_MCP1_AUDIO, "NVidia nForce" },
2817 2761 { PCI_DEVICE_ID_NVIDIA_MCP2_AUDIO, "NVidia nForce2" },
2818 2762 { PCI_DEVICE_ID_NVIDIA_MCP3_AUDIO, "NVidia nForce3" },
2819 2763 { PCI_DEVICE_ID_NVIDIA_CK8S_AUDIO, "NVidia CK8S" },
sound/pci/intel8x0m.c
Diff comments   View file @ 8cdfd25
... ... @@ -73,51 +73,6 @@
73 73 /*
74 74 * Direct registers
75 75 */
76   -
77   -#ifndef PCI_DEVICE_ID_INTEL_82801_6
78   -#define PCI_DEVICE_ID_INTEL_82801_6 0x2416
79   -#endif
80   -#ifndef PCI_DEVICE_ID_INTEL_82901_6
81   -#define PCI_DEVICE_ID_INTEL_82901_6 0x2426
82   -#endif
83   -#ifndef PCI_DEVICE_ID_INTEL_82801BA_6
84   -#define PCI_DEVICE_ID_INTEL_82801BA_6 0x2446
85   -#endif
86   -#ifndef PCI_DEVICE_ID_INTEL_440MX_6
87   -#define PCI_DEVICE_ID_INTEL_440MX_6 0x7196
88   -#endif
89   -#ifndef PCI_DEVICE_ID_INTEL_ICH3_6
90   -#define PCI_DEVICE_ID_INTEL_ICH3_6 0x2486
91   -#endif
92   -#ifndef PCI_DEVICE_ID_INTEL_ICH4_6
93   -#define PCI_DEVICE_ID_INTEL_ICH4_6 0x24c6
94   -#endif
95   -#ifndef PCI_DEVICE_ID_INTEL_ICH5_6
96   -#define PCI_DEVICE_ID_INTEL_ICH5_6 0x24d6
97   -#endif
98   -#ifndef PCI_DEVICE_ID_INTEL_ICH6_6
99   -#define PCI_DEVICE_ID_INTEL_ICH6_6 0x266d
100   -#endif
101   -#ifndef PCI_DEVICE_ID_INTEL_ICH7_6
102   -#define PCI_DEVICE_ID_INTEL_ICH7_6 0x27dd
103   -#endif
104   -#ifndef PCI_DEVICE_ID_SI_7013
105   -#define PCI_DEVICE_ID_SI_7013 0x7013
106   -#endif
107   -#ifndef PCI_DEVICE_ID_NVIDIA_MCP_MODEM
108   -#define PCI_DEVICE_ID_NVIDIA_MCP_MODEM 0x01c1
109   -#endif
110   -#ifndef PCI_DEVICE_ID_NVIDIA_MCP2_MODEM
111   -#define PCI_DEVICE_ID_NVIDIA_MCP2_MODEM 0x0069
112   -#endif
113   -#ifndef PCI_DEVICE_ID_NVIDIA_MCP2S_MODEM
114   -#define PCI_DEVICE_ID_NVIDIA_MCP2S_MODEM 0x0089
115   -#endif
116   -#ifndef PCI_DEVICE_ID_NVIDIA_MCP3_MODEM
117   -#define PCI_DEVICE_ID_NVIDIA_MCP3_MODEM 0x00d9
118   -#endif
119   -
120   -
121 76 enum { DEVICE_INTEL, DEVICE_SIS, DEVICE_ALI, DEVICE_NFORCE };
122 77  
123 78 #define ICHREG(x) ICH_REG_##x
124 79  
125 80  
... ... @@ -1283,18 +1238,18 @@
1283 1238 unsigned int id;
1284 1239 const char *s;
1285 1240 } shortnames[] __devinitdata = {
1286   - { PCI_DEVICE_ID_INTEL_82801_6, "Intel 82801AA-ICH" },
1287   - { PCI_DEVICE_ID_INTEL_82901_6, "Intel 82901AB-ICH0" },
  1241 + { PCI_DEVICE_ID_INTEL_82801AA_6, "Intel 82801AA-ICH" },
  1242 + { PCI_DEVICE_ID_INTEL_82801AB_6, "Intel 82901AB-ICH0" },
1288 1243 { PCI_DEVICE_ID_INTEL_82801BA_6, "Intel 82801BA-ICH2" },
1289 1244 { PCI_DEVICE_ID_INTEL_440MX_6, "Intel 440MX" },
1290   - { PCI_DEVICE_ID_INTEL_ICH3_6, "Intel 82801CA-ICH3" },
1291   - { PCI_DEVICE_ID_INTEL_ICH4_6, "Intel 82801DB-ICH4" },
1292   - { PCI_DEVICE_ID_INTEL_ICH5_6, "Intel ICH5" },
1293   - { PCI_DEVICE_ID_INTEL_ICH6_6, "Intel ICH6" },
1294   - { PCI_DEVICE_ID_INTEL_ICH7_6, "Intel ICH7" },
  1245 + { PCI_DEVICE_ID_INTEL_82801CA_6, "Intel 82801CA-ICH3" },
  1246 + { PCI_DEVICE_ID_INTEL_82801DB_6, "Intel 82801DB-ICH4" },
  1247 + { PCI_DEVICE_ID_INTEL_82801EB_6, "Intel ICH5" },
  1248 + { PCI_DEVICE_ID_INTEL_ICH6_17, "Intel ICH6" },
  1249 + { PCI_DEVICE_ID_INTEL_ICH7_19, "Intel ICH7" },
1295 1250 { 0x7446, "AMD AMD768" },
1296 1251 { PCI_DEVICE_ID_SI_7013, "SiS SI7013" },
1297   - { PCI_DEVICE_ID_NVIDIA_MCP_MODEM, "NVidia nForce" },
  1252 + { PCI_DEVICE_ID_NVIDIA_MCP1_MODEM, "NVidia nForce" },
1298 1253 { PCI_DEVICE_ID_NVIDIA_MCP2_MODEM, "NVidia nForce2" },
1299 1254 { PCI_DEVICE_ID_NVIDIA_MCP2S_MODEM, "NVidia nForce2s" },
1300 1255 { PCI_DEVICE_ID_NVIDIA_MCP3_MODEM, "NVidia nForce3" },
sound/pci/maestro3.c
Diff comments   View file @ 8cdfd25
... ... @@ -872,35 +872,6 @@
872 872 /*
873 873 * pci ids
874 874 */
875   -
876   -#ifndef PCI_VENDOR_ID_ESS
877   -#define PCI_VENDOR_ID_ESS 0x125D
878   -#endif
879   -#ifndef PCI_DEVICE_ID_ESS_ALLEGRO_1
880   -#define PCI_DEVICE_ID_ESS_ALLEGRO_1 0x1988
881   -#endif
882   -#ifndef PCI_DEVICE_ID_ESS_ALLEGRO
883   -#define PCI_DEVICE_ID_ESS_ALLEGRO 0x1989
884   -#endif
885   -#ifndef PCI_DEVICE_ID_ESS_CANYON3D_2LE
886   -#define PCI_DEVICE_ID_ESS_CANYON3D_2LE 0x1990
887   -#endif
888   -#ifndef PCI_DEVICE_ID_ESS_CANYON3D_2
889   -#define PCI_DEVICE_ID_ESS_CANYON3D_2 0x1992
890   -#endif
891   -#ifndef PCI_DEVICE_ID_ESS_MAESTRO3
892   -#define PCI_DEVICE_ID_ESS_MAESTRO3 0x1998
893   -#endif
894   -#ifndef PCI_DEVICE_ID_ESS_MAESTRO3_1
895   -#define PCI_DEVICE_ID_ESS_MAESTRO3_1 0x1999
896   -#endif
897   -#ifndef PCI_DEVICE_ID_ESS_MAESTRO3_HW
898   -#define PCI_DEVICE_ID_ESS_MAESTRO3_HW 0x199a
899   -#endif
900   -#ifndef PCI_DEVICE_ID_ESS_MAESTRO3_2
901   -#define PCI_DEVICE_ID_ESS_MAESTRO3_2 0x199b
902   -#endif
903   -
904 875 static struct pci_device_id snd_m3_ids[] = {
905 876 {PCI_VENDOR_ID_ESS, PCI_DEVICE_ID_ESS_ALLEGRO_1, PCI_ANY_ID, PCI_ANY_ID,
906 877 PCI_CLASS_MULTIMEDIA_AUDIO << 8, 0xffff00, 0},
sound/pci/nm256/nm256.c
Diff comments   View file @ 8cdfd25
... ... @@ -259,21 +259,6 @@
259 259 /*
260 260 * PCI ids
261 261 */
262   -
263   -#ifndef PCI_VENDOR_ID_NEOMAGIC
264   -#define PCI_VENDOR_ID_NEOMEGIC 0x10c8
265   -#endif
266   -#ifndef PCI_DEVICE_ID_NEOMAGIC_NM256AV_AUDIO
267   -#define PCI_DEVICE_ID_NEOMAGIC_NM256AV_AUDIO 0x8005
268   -#endif
269   -#ifndef PCI_DEVICE_ID_NEOMAGIC_NM256ZX_AUDIO
270   -#define PCI_DEVICE_ID_NEOMAGIC_NM256ZX_AUDIO 0x8006
271   -#endif
272   -#ifndef PCI_DEVICE_ID_NEOMAGIC_NM256XL_PLUS_AUDIO
273   -#define PCI_DEVICE_ID_NEOMAGIC_NM256XL_PLUS_AUDIO 0x8016
274   -#endif
275   -
276   -
277 262 static struct pci_device_id snd_nm256_ids[] = {
278 263 {PCI_VENDOR_ID_NEOMAGIC, PCI_DEVICE_ID_NEOMAGIC_NM256AV_AUDIO, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
279 264 {PCI_VENDOR_ID_NEOMAGIC, PCI_DEVICE_ID_NEOMAGIC_NM256ZX_AUDIO, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
... ... @@ -192,20 +192,6 @@
192 192 #define RME32_PRO_REVISION_WITH_8414 150
193 193  
194 194  
195   -/* PCI vendor/device ID's */
196   -#ifndef PCI_VENDOR_ID_XILINX_RME
197   -# define PCI_VENDOR_ID_XILINX_RME 0xea60
198   -#endif
199   -#ifndef PCI_DEVICE_ID_DIGI32
200   -# define PCI_DEVICE_ID_DIGI32 0x9896
201   -#endif
202   -#ifndef PCI_DEVICE_ID_DIGI32_PRO
203   -# define PCI_DEVICE_ID_DIGI32_PRO 0x9897
204   -#endif
205   -#ifndef PCI_DEVICE_ID_DIGI32_8
206   -# define PCI_DEVICE_ID_DIGI32_8 0x9898
207   -#endif
208   -
209 195 typedef struct snd_rme32 {
210 196 spinlock_t lock;
211 197 int irq;
... ... @@ -200,25 +200,6 @@
200 200 #define RME96_AD1852_VOL_BITS 14
201 201 #define RME96_AD1855_VOL_BITS 10
202 202  
203   -/*
204   - * PCI vendor/device ids, could in the future be defined in <linux/pci.h>,
205   - * therefore #ifndef is used.
206   - */
207   -#ifndef PCI_VENDOR_ID_XILINX
208   -#define PCI_VENDOR_ID_XILINX 0x10ee
209   -#endif
210   -#ifndef PCI_DEVICE_ID_DIGI96
211   -#define PCI_DEVICE_ID_DIGI96 0x3fc0
212   -#endif
213   -#ifndef PCI_DEVICE_ID_DIGI96_8
214   -#define PCI_DEVICE_ID_DIGI96_8 0x3fc1
215   -#endif
216   -#ifndef PCI_DEVICE_ID_DIGI96_8_PRO
217   -#define PCI_DEVICE_ID_DIGI96_8_PRO 0x3fc2
218   -#endif
219   -#ifndef PCI_DEVICE_ID_DIGI96_8_PAD_OR_PST
220   -#define PCI_DEVICE_ID_DIGI96_8_PAD_OR_PST 0x3fc3
221   -#endif
222 203  
223 204 typedef struct snd_rme96 {
224 205 spinlock_t lock;
sound/pci/rme9652/hdsp.c
Diff comments   View file @ 8cdfd25
... ... @@ -370,13 +370,6 @@
370 370 #define UNITY_GAIN 32768
371 371 #define MINUS_INFINITY_GAIN 0
372 372  
373   -#ifndef PCI_VENDOR_ID_XILINX
374   -#define PCI_VENDOR_ID_XILINX 0x10ee
375   -#endif
376   -#ifndef PCI_DEVICE_ID_XILINX_HAMMERFALL_DSP
377   -#define PCI_DEVICE_ID_XILINX_HAMMERFALL_DSP 0x3fc5
378   -#endif
379   -
380 373 /* the size of a substream (1 mono data stream) */
381 374  
382 375 #define HDSP_CHANNEL_BUFFER_SAMPLES (16*1024)
sound/pci/rme9652/hdspm.c
Diff comments   View file @ 8cdfd25
... ... @@ -301,18 +301,6 @@
301 301 #define UNITY_GAIN 32768 /* = 65536/2 */
302 302 #define MINUS_INFINITY_GAIN 0
303 303  
304   -/* PCI info */
305   -#ifndef PCI_VENDOR_ID_XILINX
306   -#define PCI_VENDOR_ID_XILINX 0x10ee
307   -#endif
308   -#ifndef PCI_DEVICE_ID_XILINX_HAMMERFALL_DSP
309   -#define PCI_DEVICE_ID_XILINX_HAMMERFALL_DSP 0x3fc5
310   -#endif
311   -#ifndef PCI_DEVICE_ID_XILINX_HAMMERFALL_DSP_MADI
312   -#define PCI_DEVICE_ID_XILINX_HAMMERFALL_DSP_MADI 0x3fc6
313   -#endif
314   -
315   -
316 304 /* Number of channels for different Speed Modes */
317 305 #define MADI_SS_CHANNELS 64
318 306 #define MADI_DS_CHANNELS 32
sound/pci/rme9652/rme9652.c
Diff comments   View file @ 8cdfd25
... ... @@ -120,13 +120,6 @@
120 120  
121 121 #define RME9652_REV15_buf_pos(x) ((((x)&0xE0000000)>>26)|((x)&RME9652_buf_pos))
122 122  
123   -#ifndef PCI_VENDOR_ID_XILINX
124   -#define PCI_VENDOR_ID_XILINX 0x10ee
125   -#endif
126   -#ifndef PCI_DEVICE_ID_XILINX_HAMMERFALL
127   -#define PCI_DEVICE_ID_XILINX_HAMMERFALL 0x3fc4
128   -#endif
129   -
130 123 /* amount of io space we remap for register access. i'm not sure we
131 124 even need this much, but 1K is nice round number :)
132 125 */
sound/pci/sonicvibes.c
Diff comments   View file @ 8cdfd25
... ... @@ -50,13 +50,6 @@
50 50 #define SUPPORT_JOYSTICK 1
51 51 #endif
52 52  
53   -#ifndef PCI_VENDOR_ID_S3
54   -#define PCI_VENDOR_ID_S3 0x5333
55   -#endif
56   -#ifndef PCI_DEVICE_ID_S3_SONICVIBES
57   -#define PCI_DEVICE_ID_S3_SONICVIBES 0xca00
58   -#endif
59   -
60 53 static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX; /* Index 0-MAX */
61 54 static char *id[SNDRV_CARDS] = SNDRV_DEFAULT_STR; /* ID for this card */
62 55 static int enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_PNP; /* Enable this card */
... ... @@ -104,14 +104,6 @@
104 104 MODULE_PARM_DESC(dxs_support, "Support for DXS channels (0 = auto, 1 = enable, 2 = disable, 3 = 48k only, 4 = no VRA, 5 = enable any sample rate)");
105 105  
106 106  
107   -/* pci ids */
108   -#ifndef PCI_DEVICE_ID_VIA_82C686_5
109   -#define PCI_DEVICE_ID_VIA_82C686_5 0x3058
110   -#endif
111   -#ifndef PCI_DEVICE_ID_VIA_8233_5
112   -#define PCI_DEVICE_ID_VIA_8233_5 0x3059
113   -#endif
114   -
115 107 /* revision numbers for via686 */
116 108 #define VIA_REV_686_A 0x10
117 109 #define VIA_REV_686_B 0x11