Skip to content

K
Kernel

openeuler / Kernel
1 年多 前同步成功

通知 8
Star 0
Fork 0
K
Kernel
提交 8cdfd251 编写于 作者: T Takashi Iwai 提交者： Jaroslav Kysela
浏览文件
操作

[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: NTakashi Iwai <tiwai@suse.de>
上级 df8db936
隐藏空白更改
内联 并排
Showing with 17 addition and 405 deletion
include/sound/cs46xx.h
浏览文件 @ 8cdfd251
...@@ -29,19 +29,6 @@ ...@@ -29,19 +29,6 @@
#include "ac97_codec.h" #include "ac97_codec.h"
#include "cs46xx_dsp_spos.h" #include "cs46xx_dsp_spos.h"
#ifndef PCI_VENDOR_ID_CIRRUS
#define PCI_VENDOR_ID_CIRRUS 0x1013
#endif
#ifndef PCI_DEVICE_ID_CIRRUS_4610
#define PCI_DEVICE_ID_CIRRUS_4610 0x6001
#endif
#ifndef PCI_DEVICE_ID_CIRRUS_4612
#define PCI_DEVICE_ID_CIRRUS_4612 0x6003
#endif
#ifndef PCI_DEVICE_ID_CIRRUS_4615
#define PCI_DEVICE_ID_CIRRUS_4615 0x6004
#endif
/* /*
* Direct registers * Direct registers
*/ */
......
include/sound/emu10k1.h
浏览文件 @ 8cdfd251
...@@ -35,13 +35,6 @@ ...@@ -35,13 +35,6 @@
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include <asm/io.h> #include <asm/io.h>
#ifndef PCI_VENDOR_ID_CREATIVE
#define PCI_VENDOR_ID_CREATIVE 0x1102
#endif
#ifndef PCI_DEVICE_ID_CREATIVE_EMU10K1
#define PCI_DEVICE_ID_CREATIVE_EMU10K1 0x0002
#endif
/* ------------------- DEFINES -------------------- */ /* ------------------- DEFINES -------------------- */
#define EMUPAGESIZE 4096 #define EMUPAGESIZE 4096
......
include/sound/pcm.h
浏览文件 @ 8cdfd251
...@@ -910,6 +910,7 @@ int snd_pcm_format_big_endian(snd_pcm_format_t format); ...@@ -910,6 +910,7 @@ int snd_pcm_format_big_endian(snd_pcm_format_t format);
* Returns 1 if the given PCM format is CPU-endian, 0 if * Returns 1 if the given PCM format is CPU-endian, 0 if
* opposite, or a negative error code if endian not specified. * opposite, or a negative error code if endian not specified.
*/ */
int snd_pcm_format_cpu_endian(snd_pcm_format_t format);
#ifdef SNDRV_LITTLE_ENDIAN #ifdef SNDRV_LITTLE_ENDIAN
#define snd_pcm_format_cpu_endian(format) snd_pcm_format_little_endian(format) #define snd_pcm_format_cpu_endian(format) snd_pcm_format_little_endian(format)
#else #else
......
include/sound/trident.h
浏览文件 @ 8cdfd251
...@@ -33,23 +33,6 @@ ...@@ -33,23 +33,6 @@
//#include "ainstr_gf1.h" //#include "ainstr_gf1.h"
#include "ainstr_simple.h" #include "ainstr_simple.h"
#ifndef PCI_VENDOR_ID_TRIDENT
#define PCI_VENDOR_ID_TRIDENT 0x1023
#endif
#ifndef PCI_DEVICE_ID_TRIDENT_4DWAVE_DX
#define PCI_DEVICE_ID_TRIDENT_4DWAVE_DX 0x2000
#endif
#ifndef PCI_DEVICE_ID_TRIDENT_4DWAVE_NX
#define PCI_DEVICE_ID_TRIDENT_4DWAVE_NX 0x2001
#endif
#ifndef PCI_VENDOR_ID_SI
#define PCI_VENDOR_ID_SI 0x1039
#endif
#ifndef PCI_DEVICE_ID_SI_7018
#define PCI_DEVICE_ID_SI_7018 0x7018
#endif
#define TRIDENT_DEVICE_ID_DX ((PCI_VENDOR_ID_TRIDENT<<16)|PCI_DEVICE_ID_TRIDENT_4DWAVE_DX) #define TRIDENT_DEVICE_ID_DX ((PCI_VENDOR_ID_TRIDENT<<16)|PCI_DEVICE_ID_TRIDENT_4DWAVE_DX)
#define TRIDENT_DEVICE_ID_NX ((PCI_VENDOR_ID_TRIDENT<<16)|PCI_DEVICE_ID_TRIDENT_4DWAVE_NX) #define TRIDENT_DEVICE_ID_NX ((PCI_VENDOR_ID_TRIDENT<<16)|PCI_DEVICE_ID_TRIDENT_4DWAVE_NX)
#define TRIDENT_DEVICE_ID_SI7018 ((PCI_VENDOR_ID_SI<<16)|PCI_DEVICE_ID_SI_7018) #define TRIDENT_DEVICE_ID_SI7018 ((PCI_VENDOR_ID_SI<<16)|PCI_DEVICE_ID_SI_7018)
......
include/sound/ymfpci.h
浏览文件 @ 8cdfd251
...@@ -28,28 +28,6 @@ ...@@ -28,28 +28,6 @@
#include "timer.h" #include "timer.h"
#include <linux/gameport.h> #include <linux/gameport.h>
#ifndef PCI_VENDOR_ID_YAMAHA
#define PCI_VENDOR_ID_YAMAHA 0x1073
#endif
#ifndef PCI_DEVICE_ID_YAMAHA_724
#define PCI_DEVICE_ID_YAMAHA_724 0x0004
#endif
#ifndef PCI_DEVICE_ID_YAMAHA_724F
#define PCI_DEVICE_ID_YAMAHA_724F 0x000d
#endif
#ifndef PCI_DEVICE_ID_YAMAHA_740
#define PCI_DEVICE_ID_YAMAHA_740 0x000a
#endif
#ifndef PCI_DEVICE_ID_YAMAHA_740C
#define PCI_DEVICE_ID_YAMAHA_740C 0x000c
#endif
#ifndef PCI_DEVICE_ID_YAMAHA_744
#define PCI_DEVICE_ID_YAMAHA_744 0x0010
#endif
#ifndef PCI_DEVICE_ID_YAMAHA_754
#define PCI_DEVICE_ID_YAMAHA_754 0x0012
#endif
/* /*
* Direct registers * Direct registers
*/ */
......
sound/pci/ali5451/ali5451.c
浏览文件 @ 8cdfd251
...@@ -78,15 +78,7 @@ MODULE_PARM_DESC(spdif, "Support SPDIF I/O"); ...@@ -78,15 +78,7 @@ MODULE_PARM_DESC(spdif, "Support SPDIF I/O");
* Constants definition * Constants definition
*/ */
#ifndef PCI_VENDOR_ID_ALI #define DEVICE_ID_ALI5451 ((PCI_VENDOR_ID_AL<<16)|PCI_DEVICE_ID_AL_M5451)
#define PCI_VENDOR_ID_ALI 0x10b9
#endif
#ifndef PCI_DEVICE_ID_ALI_5451
#define PCI_DEVICE_ID_ALI_5451 0x5451
#endif
#define DEVICE_ID_ALI5451 ((PCI_VENDOR_ID_ALI<<16)|PCI_DEVICE_ID_ALI_5451)
#define ALI_CHANNELS 32 #define ALI_CHANNELS 32
......
sound/pci/bt87x.c
浏览文件 @ 8cdfd251
...@@ -59,16 +59,6 @@ module_param(load_all, bool, 0444); ...@@ -59,16 +59,6 @@ module_param(load_all, bool, 0444);
MODULE_PARM_DESC(load_all, "Allow to load the non-whitelisted cards"); MODULE_PARM_DESC(load_all, "Allow to load the non-whitelisted cards");
#ifndef PCI_VENDOR_ID_BROOKTREE
#define PCI_VENDOR_ID_BROOKTREE 0x109e
#endif
#ifndef PCI_DEVICE_ID_BROOKTREE_878
#define PCI_DEVICE_ID_BROOKTREE_878 0x0878
#endif
#ifndef PCI_DEVICE_ID_BROOKTREE_879
#define PCI_DEVICE_ID_BROOKTREE_879 0x0879
#endif
/* register offsets */ /* register offsets */
#define REG_INT_STAT 0x100 /* interrupt status */ #define REG_INT_STAT 0x100 /* interrupt status */
#define REG_INT_MASK 0x104 /* interrupt mask */ #define REG_INT_MASK 0x104 /* interrupt mask */
......
sound/pci/cmipci.c
浏览文件 @ 8cdfd251
...@@ -79,13 +79,6 @@ module_param_array(joystick_port, int, NULL, 0444); ...@@ -79,13 +79,6 @@ module_param_array(joystick_port, int, NULL, 0444);
MODULE_PARM_DESC(joystick_port, "Joystick port address."); MODULE_PARM_DESC(joystick_port, "Joystick port address.");
#endif #endif
#ifndef PCI_DEVICE_ID_CMEDIA_CM8738
#define PCI_DEVICE_ID_CMEDIA_CM8738 0x0111
#endif
#ifndef PCI_DEVICE_ID_CMEDIA_CM8738B
#define PCI_DEVICE_ID_CMEDIA_CM8738B 0x0112
#endif
/* /*
* CM8x38 registers definition * CM8x38 registers definition
*/ */
...@@ -347,25 +340,6 @@ MODULE_PARM_DESC(joystick_port, "Joystick port address."); ...@@ -347,25 +340,6 @@ MODULE_PARM_DESC(joystick_port, "Joystick port address.");
#define CM_EXTENT_SYNTH 0x4 #define CM_EXTENT_SYNTH 0x4
/*
* pci ids
*/
#ifndef PCI_VENDOR_ID_CMEDIA
#define PCI_VENDOR_ID_CMEDIA 0x13F6
#endif
#ifndef PCI_DEVICE_ID_CMEDIA_CM8338A
#define PCI_DEVICE_ID_CMEDIA_CM8338A 0x0100
#endif
#ifndef PCI_DEVICE_ID_CMEDIA_CM8338B
#define PCI_DEVICE_ID_CMEDIA_CM8338B 0x0101
#endif
#ifndef PCI_DEVICE_ID_CMEDIA_CM8738
#define PCI_DEVICE_ID_CMEDIA_CM8738 0x0111
#endif
#ifndef PCI_DEVICE_ID_CMEDIA_CM8738B
#define PCI_DEVICE_ID_CMEDIA_CM8738B 0x0112
#endif
/* /*
* channels for playback / capture * channels for playback / capture
*/ */
......
sound/pci/cs4281.c
浏览文件 @ 8cdfd251
...@@ -56,17 +56,6 @@ MODULE_PARM_DESC(enable, "Enable CS4281 soundcard."); ...@@ -56,17 +56,6 @@ MODULE_PARM_DESC(enable, "Enable CS4281 soundcard.");
module_param_array(dual_codec, bool, NULL, 0444); module_param_array(dual_codec, bool, NULL, 0444);
MODULE_PARM_DESC(dual_codec, "Secondary Codec ID (0 = disabled)."); MODULE_PARM_DESC(dual_codec, "Secondary Codec ID (0 = disabled).");
/*
*
*/
#ifndef PCI_VENDOR_ID_CIRRUS
#define PCI_VENDOR_ID_CIRRUS 0x1013
#endif
#ifndef PCI_DEVICE_ID_CIRRUS_4281
#define PCI_DEVICE_ID_CIRRUS_4281 0x6005
#endif
/* /*
* Direct registers * Direct registers
*/ */
......
sound/pci/cs46xx/cs46xx_lib.c
浏览文件 @ 8cdfd251
...@@ -3524,17 +3524,6 @@ static void amp_voyetra_4294(cs46xx_t *chip, int change) ...@@ -3524,17 +3524,6 @@ static void amp_voyetra_4294(cs46xx_t *chip, int change)
#endif #endif
/*
* piix4 pci ids
*/
#ifndef PCI_VENDOR_ID_INTEL
#define PCI_VENDOR_ID_INTEL 0x8086
#endif /* PCI_VENDOR_ID_INTEL */
#ifndef PCI_DEVICE_ID_INTEL_82371AB_3
#define PCI_DEVICE_ID_INTEL_82371AB_3 0x7113
#endif /* PCI_DEVICE_ID_INTEL_82371AB_3 */
/* /*
* Handle the CLKRUN on a thinkpad. We must disable CLKRUN support * Handle the CLKRUN on a thinkpad. We must disable CLKRUN support
* whenever we need to beat on the chip. * whenever we need to beat on the chip.
......
sound/pci/ens1370.c
浏览文件 @ 8cdfd251
...@@ -100,13 +100,6 @@ MODULE_PARM_DESC(joystick, "Enable joystick."); ...@@ -100,13 +100,6 @@ MODULE_PARM_DESC(joystick, "Enable joystick.");
#endif #endif
#endif /* SUPPORT_JOYSTICK */ #endif /* SUPPORT_JOYSTICK */
#ifndef PCI_DEVICE_ID_ENSONIQ_CT5880
#define PCI_DEVICE_ID_ENSONIQ_CT5880 0x5880
#endif
#ifndef PCI_DEVICE_ID_ENSONIQ_ES1371
#define PCI_DEVICE_ID_ENSONIQ_ES1371 0x1371
#endif
/* ES1371 chip ID */ /* ES1371 chip ID */
/* This is a little confusing because all ES1371 compatible chips have the /* This is a little confusing because all ES1371 compatible chips have the
same DEVICE_ID, the only thing differentiating them is the REV_ID field. same DEVICE_ID, the only thing differentiating them is the REV_ID field.
......
sound/pci/es1938.c
浏览文件 @ 8cdfd251
...@@ -76,13 +76,6 @@ MODULE_SUPPORTED_DEVICE("{{ESS,ES1938}," ...@@ -76,13 +76,6 @@ MODULE_SUPPORTED_DEVICE("{{ESS,ES1938},"
#define SUPPORT_JOYSTICK 1 #define SUPPORT_JOYSTICK 1
#endif #endif
#ifndef PCI_VENDOR_ID_ESS
#define PCI_VENDOR_ID_ESS 0x125d
#endif
#ifndef PCI_DEVICE_ID_ESS_ES1938
#define PCI_DEVICE_ID_ESS_ES1938 0x1969
#endif
static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX; /* Index 0-MAX */ static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX; /* Index 0-MAX */
static char *id[SNDRV_CARDS] = SNDRV_DEFAULT_STR; /* ID for this card */ static char *id[SNDRV_CARDS] = SNDRV_DEFAULT_STR; /* ID for this card */
static int enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_PNP; /* Enable this card */ static int enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_PNP; /* Enable this card */
......
sound/pci/es1968.c
浏览文件 @ 8cdfd251
...@@ -160,25 +160,6 @@ MODULE_PARM_DESC(joystick, "Enable joystick."); ...@@ -160,25 +160,6 @@ MODULE_PARM_DESC(joystick, "Enable joystick.");
#endif #endif
/* PCI Dev ID's */
#ifndef PCI_VENDOR_ID_ESS
#define PCI_VENDOR_ID_ESS 0x125D
#endif
#define PCI_VENDOR_ID_ESS_OLD 0x1285 /* Platform Tech, the people the ESS
was bought form */
#ifndef PCI_DEVICE_ID_ESS_M2E
#define PCI_DEVICE_ID_ESS_M2E 0x1978
#endif
#ifndef PCI_DEVICE_ID_ESS_M2
#define PCI_DEVICE_ID_ESS_M2 0x1968
#endif
#ifndef PCI_DEVICE_ID_ESS_M1
#define PCI_DEVICE_ID_ESS_M1 0x0100
#endif
#define NR_APUS 64 #define NR_APUS 64
#define NR_APU_REGS 16 #define NR_APU_REGS 16
......
sound/pci/ice1712/ice1712.c
浏览文件 @ 8cdfd251
...@@ -100,12 +100,6 @@ MODULE_PARM_DESC(cs8427_timeout, "Define reset timeout for cs8427 chip in msec r ...@@ -100,12 +100,6 @@ MODULE_PARM_DESC(cs8427_timeout, "Define reset timeout for cs8427 chip in msec r
module_param_array(model, charp, NULL, 0444); module_param_array(model, charp, NULL, 0444);
MODULE_PARM_DESC(model, "Use the given board model."); MODULE_PARM_DESC(model, "Use the given board model.");
#ifndef PCI_VENDOR_ID_ICE
#define PCI_VENDOR_ID_ICE 0x1412
#endif
#ifndef PCI_DEVICE_ID_ICE_1712
#define PCI_DEVICE_ID_ICE_1712 0x1712
#endif
static struct pci_device_id snd_ice1712_ids[] = { static struct pci_device_id snd_ice1712_ids[] = {
{ PCI_VENDOR_ID_ICE, PCI_DEVICE_ID_ICE_1712, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 }, /* ICE1712 */ { PCI_VENDOR_ID_ICE, PCI_DEVICE_ID_ICE_1712, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 }, /* ICE1712 */
......
sound/pci/ice1712/ice1724.c
浏览文件 @ 8cdfd251
...@@ -83,12 +83,6 @@ MODULE_PARM_DESC(enable, "Enable ICE1724 soundcard."); ...@@ -83,12 +83,6 @@ MODULE_PARM_DESC(enable, "Enable ICE1724 soundcard.");
module_param_array(model, charp, NULL, 0444); module_param_array(model, charp, NULL, 0444);
MODULE_PARM_DESC(model, "Use the given board model."); MODULE_PARM_DESC(model, "Use the given board model.");
#ifndef PCI_VENDOR_ID_ICE
#define PCI_VENDOR_ID_ICE 0x1412
#endif
#ifndef PCI_DEVICE_ID_VT1724
#define PCI_DEVICE_ID_VT1724 0x1724
#endif
/* Both VT1720 and VT1724 have the same PCI IDs */ /* Both VT1720 and VT1724 have the same PCI IDs */
static struct pci_device_id snd_vt1724_ids[] = { static struct pci_device_id snd_vt1724_ids[] = {
......
sound/pci/intel8x0.c
浏览文件 @ 8cdfd251
...@@ -94,62 +94,6 @@ MODULE_PARM_DESC(xbox, "Set to 1 for Xbox, if you have problems with the AC'97 c ...@@ -94,62 +94,6 @@ MODULE_PARM_DESC(xbox, "Set to 1 for Xbox, if you have problems with the AC'97 c
/* /*
* Direct registers * Direct registers
*/ */
#ifndef PCI_DEVICE_ID_INTEL_82801
#define PCI_DEVICE_ID_INTEL_82801 0x2415
#endif
#ifndef PCI_DEVICE_ID_INTEL_82901
#define PCI_DEVICE_ID_INTEL_82901 0x2425
#endif
#ifndef PCI_DEVICE_ID_INTEL_82801BA
#define PCI_DEVICE_ID_INTEL_82801BA 0x2445
#endif
#ifndef PCI_DEVICE_ID_INTEL_440MX
#define PCI_DEVICE_ID_INTEL_440MX 0x7195
#endif
#ifndef PCI_DEVICE_ID_INTEL_ICH3
#define PCI_DEVICE_ID_INTEL_ICH3 0x2485
#endif
#ifndef PCI_DEVICE_ID_INTEL_ICH4
#define PCI_DEVICE_ID_INTEL_ICH4 0x24c5
#endif
#ifndef PCI_DEVICE_ID_INTEL_ICH5
#define PCI_DEVICE_ID_INTEL_ICH5 0x24d5
#endif
#ifndef PCI_DEVICE_ID_INTEL_ESB_5
#define PCI_DEVICE_ID_INTEL_ESB_5 0x25a6
#endif
#ifndef PCI_DEVICE_ID_INTEL_ICH6_18
#define PCI_DEVICE_ID_INTEL_ICH6_18 0x266e
#endif
#ifndef PCI_DEVICE_ID_INTEL_ICH7_20
#define PCI_DEVICE_ID_INTEL_ICH7_20 0x27de
#endif
#ifndef PCI_DEVICE_ID_INTEL_ESB2_14
#define PCI_DEVICE_ID_INTEL_ESB2_14 0x2698
#endif
#ifndef PCI_DEVICE_ID_SI_7012
#define PCI_DEVICE_ID_SI_7012 0x7012
#endif
#ifndef PCI_DEVICE_ID_NVIDIA_MCP_AUDIO
#define PCI_DEVICE_ID_NVIDIA_MCP_AUDIO 0x01b1
#endif
#ifndef PCI_DEVICE_ID_NVIDIA_CK804_AUDIO
#define PCI_DEVICE_ID_NVIDIA_CK804_AUDIO 0x0059
#endif
#ifndef PCI_DEVICE_ID_NVIDIA_MCP2_AUDIO
#define PCI_DEVICE_ID_NVIDIA_MCP2_AUDIO 0x006a
#endif
#ifndef PCI_DEVICE_ID_NVIDIA_CK8_AUDIO
#define PCI_DEVICE_ID_NVIDIA_CK8_AUDIO 0x008a
#endif
#ifndef PCI_DEVICE_ID_NVIDIA_MCP3_AUDIO
#define PCI_DEVICE_ID_NVIDIA_MCP3_AUDIO 0x00da
#endif
#ifndef PCI_DEVICE_ID_NVIDIA_CK8S_AUDIO
#define PCI_DEVICE_ID_NVIDIA_CK8S_AUDIO 0x00ea
#endif
enum { DEVICE_INTEL, DEVICE_INTEL_ICH4, DEVICE_SIS, DEVICE_ALI, DEVICE_NFORCE }; enum { DEVICE_INTEL, DEVICE_INTEL_ICH4, DEVICE_SIS, DEVICE_ALI, DEVICE_NFORCE };
#define ICHREG(x) ICH_REG_##x #define ICHREG(x) ICH_REG_##x
...@@ -2801,19 +2745,19 @@ static struct shortname_table { ...@@ -2801,19 +2745,19 @@ static struct shortname_table {
unsigned int id; unsigned int id;
const char *s; const char *s;
} shortnames[] __devinitdata = { } shortnames[] __devinitdata = {
{ PCI_DEVICE_ID_INTEL_82801, "Intel 82801AA-ICH" }, { PCI_DEVICE_ID_INTEL_82801AA_5, "Intel 82801AA-ICH" },
{ PCI_DEVICE_ID_INTEL_82901, "Intel 82901AB-ICH0" }, { PCI_DEVICE_ID_INTEL_82801AB_5, "Intel 82901AB-ICH0" },
{ PCI_DEVICE_ID_INTEL_82801BA, "Intel 82801BA-ICH2" }, { PCI_DEVICE_ID_INTEL_82801BA_4, "Intel 82801BA-ICH2" },
{ PCI_DEVICE_ID_INTEL_440MX, "Intel 440MX" }, { PCI_DEVICE_ID_INTEL_440MX, "Intel 440MX" },
{ PCI_DEVICE_ID_INTEL_ICH3, "Intel 82801CA-ICH3" }, { PCI_DEVICE_ID_INTEL_82801CA_5, "Intel 82801CA-ICH3" },
{ PCI_DEVICE_ID_INTEL_ICH4, "Intel 82801DB-ICH4" }, { PCI_DEVICE_ID_INTEL_82801DB_5, "Intel 82801DB-ICH4" },
{ PCI_DEVICE_ID_INTEL_ICH5, "Intel ICH5" }, { PCI_DEVICE_ID_INTEL_82801EB_5, "Intel ICH5" },
{ PCI_DEVICE_ID_INTEL_ESB_5, "Intel 6300ESB" }, { PCI_DEVICE_ID_INTEL_ESB_5, "Intel 6300ESB" },
{ PCI_DEVICE_ID_INTEL_ICH6_18, "Intel ICH6" }, { PCI_DEVICE_ID_INTEL_ICH6_18, "Intel ICH6" },
{ PCI_DEVICE_ID_INTEL_ICH7_20, "Intel ICH7" }, { PCI_DEVICE_ID_INTEL_ICH7_20, "Intel ICH7" },
{ PCI_DEVICE_ID_INTEL_ESB2_14, "Intel ESB2" }, { PCI_DEVICE_ID_INTEL_ESB2_14, "Intel ESB2" },
{ PCI_DEVICE_ID_SI_7012, "SiS SI7012" }, { PCI_DEVICE_ID_SI_7012, "SiS SI7012" },
{ PCI_DEVICE_ID_NVIDIA_MCP_AUDIO, "NVidia nForce" }, { PCI_DEVICE_ID_NVIDIA_MCP1_AUDIO, "NVidia nForce" },
{ PCI_DEVICE_ID_NVIDIA_MCP2_AUDIO, "NVidia nForce2" }, { PCI_DEVICE_ID_NVIDIA_MCP2_AUDIO, "NVidia nForce2" },
{ PCI_DEVICE_ID_NVIDIA_MCP3_AUDIO, "NVidia nForce3" }, { PCI_DEVICE_ID_NVIDIA_MCP3_AUDIO, "NVidia nForce3" },
{ PCI_DEVICE_ID_NVIDIA_CK8S_AUDIO, "NVidia CK8S" }, { PCI_DEVICE_ID_NVIDIA_CK8S_AUDIO, "NVidia CK8S" },
......
sound/pci/intel8x0m.c
浏览文件 @ 8cdfd251
...@@ -73,51 +73,6 @@ MODULE_PARM_DESC(ac97_clock, "AC'97 codec clock (0 = auto-detect)."); ...@@ -73,51 +73,6 @@ MODULE_PARM_DESC(ac97_clock, "AC'97 codec clock (0 = auto-detect).");
/* /*
* Direct registers * Direct registers
*/ */
#ifndef PCI_DEVICE_ID_INTEL_82801_6
#define PCI_DEVICE_ID_INTEL_82801_6 0x2416
#endif
#ifndef PCI_DEVICE_ID_INTEL_82901_6
#define PCI_DEVICE_ID_INTEL_82901_6 0x2426
#endif
#ifndef PCI_DEVICE_ID_INTEL_82801BA_6
#define PCI_DEVICE_ID_INTEL_82801BA_6 0x2446
#endif
#ifndef PCI_DEVICE_ID_INTEL_440MX_6
#define PCI_DEVICE_ID_INTEL_440MX_6 0x7196
#endif
#ifndef PCI_DEVICE_ID_INTEL_ICH3_6
#define PCI_DEVICE_ID_INTEL_ICH3_6 0x2486
#endif
#ifndef PCI_DEVICE_ID_INTEL_ICH4_6
#define PCI_DEVICE_ID_INTEL_ICH4_6 0x24c6
#endif
#ifndef PCI_DEVICE_ID_INTEL_ICH5_6
#define PCI_DEVICE_ID_INTEL_ICH5_6 0x24d6
#endif
#ifndef PCI_DEVICE_ID_INTEL_ICH6_6
#define PCI_DEVICE_ID_INTEL_ICH6_6 0x266d
#endif
#ifndef PCI_DEVICE_ID_INTEL_ICH7_6
#define PCI_DEVICE_ID_INTEL_ICH7_6 0x27dd
#endif
#ifndef PCI_DEVICE_ID_SI_7013
#define PCI_DEVICE_ID_SI_7013 0x7013
#endif
#ifndef PCI_DEVICE_ID_NVIDIA_MCP_MODEM
#define PCI_DEVICE_ID_NVIDIA_MCP_MODEM 0x01c1
#endif
#ifndef PCI_DEVICE_ID_NVIDIA_MCP2_MODEM
#define PCI_DEVICE_ID_NVIDIA_MCP2_MODEM 0x0069
#endif
#ifndef PCI_DEVICE_ID_NVIDIA_MCP2S_MODEM
#define PCI_DEVICE_ID_NVIDIA_MCP2S_MODEM 0x0089
#endif
#ifndef PCI_DEVICE_ID_NVIDIA_MCP3_MODEM
#define PCI_DEVICE_ID_NVIDIA_MCP3_MODEM 0x00d9
#endif
enum { DEVICE_INTEL, DEVICE_SIS, DEVICE_ALI, DEVICE_NFORCE }; enum { DEVICE_INTEL, DEVICE_SIS, DEVICE_ALI, DEVICE_NFORCE };
#define ICHREG(x) ICH_REG_##x #define ICHREG(x) ICH_REG_##x
...@@ -1283,18 +1238,18 @@ static struct shortname_table { ...@@ -1283,18 +1238,18 @@ static struct shortname_table {
unsigned int id; unsigned int id;
const char *s; const char *s;
} shortnames[] __devinitdata = { } shortnames[] __devinitdata = {
{ PCI_DEVICE_ID_INTEL_82801_6, "Intel 82801AA-ICH" }, { PCI_DEVICE_ID_INTEL_82801AA_6, "Intel 82801AA-ICH" },
{ PCI_DEVICE_ID_INTEL_82901_6, "Intel 82901AB-ICH0" }, { PCI_DEVICE_ID_INTEL_82801AB_6, "Intel 82901AB-ICH0" },
{ PCI_DEVICE_ID_INTEL_82801BA_6, "Intel 82801BA-ICH2" }, { PCI_DEVICE_ID_INTEL_82801BA_6, "Intel 82801BA-ICH2" },
{ PCI_DEVICE_ID_INTEL_440MX_6, "Intel 440MX" }, { PCI_DEVICE_ID_INTEL_440MX_6, "Intel 440MX" },
{ PCI_DEVICE_ID_INTEL_ICH3_6, "Intel 82801CA-ICH3" }, { PCI_DEVICE_ID_INTEL_82801CA_6, "Intel 82801CA-ICH3" },
{ PCI_DEVICE_ID_INTEL_ICH4_6, "Intel 82801DB-ICH4" }, { PCI_DEVICE_ID_INTEL_82801DB_6, "Intel 82801DB-ICH4" },
{ PCI_DEVICE_ID_INTEL_ICH5_6, "Intel ICH5" }, { PCI_DEVICE_ID_INTEL_82801EB_6, "Intel ICH5" },
{ PCI_DEVICE_ID_INTEL_ICH6_6, "Intel ICH6" }, { PCI_DEVICE_ID_INTEL_ICH6_17, "Intel ICH6" },
{ PCI_DEVICE_ID_INTEL_ICH7_6, "Intel ICH7" }, { PCI_DEVICE_ID_INTEL_ICH7_19, "Intel ICH7" },
{ 0x7446, "AMD AMD768" }, { 0x7446, "AMD AMD768" },
{ PCI_DEVICE_ID_SI_7013, "SiS SI7013" }, { PCI_DEVICE_ID_SI_7013, "SiS SI7013" },
{ PCI_DEVICE_ID_NVIDIA_MCP_MODEM, "NVidia nForce" }, { PCI_DEVICE_ID_NVIDIA_MCP1_MODEM, "NVidia nForce" },
{ PCI_DEVICE_ID_NVIDIA_MCP2_MODEM, "NVidia nForce2" }, { PCI_DEVICE_ID_NVIDIA_MCP2_MODEM, "NVidia nForce2" },
{ PCI_DEVICE_ID_NVIDIA_MCP2S_MODEM, "NVidia nForce2s" }, { PCI_DEVICE_ID_NVIDIA_MCP2S_MODEM, "NVidia nForce2s" },
{ PCI_DEVICE_ID_NVIDIA_MCP3_MODEM, "NVidia nForce3" }, { PCI_DEVICE_ID_NVIDIA_MCP3_MODEM, "NVidia nForce3" },
......
sound/pci/maestro3.c
浏览文件 @ 8cdfd251
...@@ -872,35 +872,6 @@ struct snd_m3 { ...@@ -872,35 +872,6 @@ struct snd_m3 {
/* /*
* pci ids * pci ids
*/ */
#ifndef PCI_VENDOR_ID_ESS
#define PCI_VENDOR_ID_ESS 0x125D
#endif
#ifndef PCI_DEVICE_ID_ESS_ALLEGRO_1
#define PCI_DEVICE_ID_ESS_ALLEGRO_1 0x1988
#endif
#ifndef PCI_DEVICE_ID_ESS_ALLEGRO
#define PCI_DEVICE_ID_ESS_ALLEGRO 0x1989
#endif
#ifndef PCI_DEVICE_ID_ESS_CANYON3D_2LE
#define PCI_DEVICE_ID_ESS_CANYON3D_2LE 0x1990
#endif
#ifndef PCI_DEVICE_ID_ESS_CANYON3D_2
#define PCI_DEVICE_ID_ESS_CANYON3D_2 0x1992
#endif
#ifndef PCI_DEVICE_ID_ESS_MAESTRO3
#define PCI_DEVICE_ID_ESS_MAESTRO3 0x1998
#endif
#ifndef PCI_DEVICE_ID_ESS_MAESTRO3_1
#define PCI_DEVICE_ID_ESS_MAESTRO3_1 0x1999
#endif
#ifndef PCI_DEVICE_ID_ESS_MAESTRO3_HW
#define PCI_DEVICE_ID_ESS_MAESTRO3_HW 0x199a
#endif
#ifndef PCI_DEVICE_ID_ESS_MAESTRO3_2
#define PCI_DEVICE_ID_ESS_MAESTRO3_2 0x199b
#endif
static struct pci_device_id snd_m3_ids[] = { static struct pci_device_id snd_m3_ids[] = {
{PCI_VENDOR_ID_ESS, PCI_DEVICE_ID_ESS_ALLEGRO_1, PCI_ANY_ID, PCI_ANY_ID, {PCI_VENDOR_ID_ESS, PCI_DEVICE_ID_ESS_ALLEGRO_1, PCI_ANY_ID, PCI_ANY_ID,
PCI_CLASS_MULTIMEDIA_AUDIO << 8, 0xffff00, 0}, PCI_CLASS_MULTIMEDIA_AUDIO << 8, 0xffff00, 0},
......
sound/pci/nm256/nm256.c
浏览文件 @ 8cdfd251
...@@ -259,21 +259,6 @@ struct snd_nm256 { ...@@ -259,21 +259,6 @@ struct snd_nm256 {
/* /*
* PCI ids * PCI ids
*/ */
#ifndef PCI_VENDOR_ID_NEOMAGIC
#define PCI_VENDOR_ID_NEOMEGIC 0x10c8
#endif
#ifndef PCI_DEVICE_ID_NEOMAGIC_NM256AV_AUDIO
#define PCI_DEVICE_ID_NEOMAGIC_NM256AV_AUDIO 0x8005
#endif
#ifndef PCI_DEVICE_ID_NEOMAGIC_NM256ZX_AUDIO
#define PCI_DEVICE_ID_NEOMAGIC_NM256ZX_AUDIO 0x8006
#endif
#ifndef PCI_DEVICE_ID_NEOMAGIC_NM256XL_PLUS_AUDIO
#define PCI_DEVICE_ID_NEOMAGIC_NM256XL_PLUS_AUDIO 0x8016
#endif
static struct pci_device_id snd_nm256_ids[] = { static struct pci_device_id snd_nm256_ids[] = {
{PCI_VENDOR_ID_NEOMAGIC, PCI_DEVICE_ID_NEOMAGIC_NM256AV_AUDIO, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, {PCI_VENDOR_ID_NEOMAGIC, PCI_DEVICE_ID_NEOMAGIC_NM256AV_AUDIO, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
{PCI_VENDOR_ID_NEOMAGIC, PCI_DEVICE_ID_NEOMAGIC_NM256ZX_AUDIO, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, {PCI_VENDOR_ID_NEOMAGIC, PCI_DEVICE_ID_NEOMAGIC_NM256ZX_AUDIO, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
......
sound/pci/rme32.c
浏览文件 @ 8cdfd251
...@@ -192,20 +192,6 @@ MODULE_SUPPORTED_DEVICE("{{RME,Digi32}," "{RME,Digi32/8}," "{RME,Digi32 PRO}}"); ...@@ -192,20 +192,6 @@ MODULE_SUPPORTED_DEVICE("{{RME,Digi32}," "{RME,Digi32/8}," "{RME,Digi32 PRO}}");
#define RME32_PRO_REVISION_WITH_8414 150 #define RME32_PRO_REVISION_WITH_8414 150
/* PCI vendor/device ID's */
#ifndef PCI_VENDOR_ID_XILINX_RME
# define PCI_VENDOR_ID_XILINX_RME 0xea60
#endif
#ifndef PCI_DEVICE_ID_DIGI32
# define PCI_DEVICE_ID_DIGI32 0x9896
#endif
#ifndef PCI_DEVICE_ID_DIGI32_PRO
# define PCI_DEVICE_ID_DIGI32_PRO 0x9897
#endif
#ifndef PCI_DEVICE_ID_DIGI32_8
# define PCI_DEVICE_ID_DIGI32_8 0x9898
#endif
typedef struct snd_rme32 { typedef struct snd_rme32 {
spinlock_t lock; spinlock_t lock;
int irq; int irq;
......
sound/pci/rme96.c
浏览文件 @ 8cdfd251
...@@ -200,25 +200,6 @@ MODULE_PARM_DESC(enable, "Enable RME Digi96 soundcard."); ...@@ -200,25 +200,6 @@ MODULE_PARM_DESC(enable, "Enable RME Digi96 soundcard.");
#define RME96_AD1852_VOL_BITS 14 #define RME96_AD1852_VOL_BITS 14
#define RME96_AD1855_VOL_BITS 10 #define RME96_AD1855_VOL_BITS 10
/*
* PCI vendor/device ids, could in the future be defined in <linux/pci.h>,
* therefore #ifndef is used.
*/
#ifndef PCI_VENDOR_ID_XILINX
#define PCI_VENDOR_ID_XILINX 0x10ee
#endif
#ifndef PCI_DEVICE_ID_DIGI96
#define PCI_DEVICE_ID_DIGI96 0x3fc0
#endif
#ifndef PCI_DEVICE_ID_DIGI96_8
#define PCI_DEVICE_ID_DIGI96_8 0x3fc1
#endif
#ifndef PCI_DEVICE_ID_DIGI96_8_PRO
#define PCI_DEVICE_ID_DIGI96_8_PRO 0x3fc2
#endif
#ifndef PCI_DEVICE_ID_DIGI96_8_PAD_OR_PST
#define PCI_DEVICE_ID_DIGI96_8_PAD_OR_PST 0x3fc3
#endif
typedef struct snd_rme96 { typedef struct snd_rme96 {
spinlock_t lock; spinlock_t lock;
......
sound/pci/rme9652/hdsp.c
浏览文件 @ 8cdfd251
...@@ -370,13 +370,6 @@ MODULE_SUPPORTED_DEVICE("{{RME Hammerfall-DSP}," ...@@ -370,13 +370,6 @@ MODULE_SUPPORTED_DEVICE("{{RME Hammerfall-DSP},"
#define UNITY_GAIN 32768 #define UNITY_GAIN 32768
#define MINUS_INFINITY_GAIN 0 #define MINUS_INFINITY_GAIN 0
#ifndef PCI_VENDOR_ID_XILINX
#define PCI_VENDOR_ID_XILINX 0x10ee
#endif
#ifndef PCI_DEVICE_ID_XILINX_HAMMERFALL_DSP
#define PCI_DEVICE_ID_XILINX_HAMMERFALL_DSP 0x3fc5
#endif
/* the size of a substream (1 mono data stream) */ /* the size of a substream (1 mono data stream) */
#define HDSP_CHANNEL_BUFFER_SAMPLES (16*1024) #define HDSP_CHANNEL_BUFFER_SAMPLES (16*1024)
......
sound/pci/rme9652/hdspm.c
浏览文件 @ 8cdfd251
...@@ -301,18 +301,6 @@ MODULE_SUPPORTED_DEVICE("{{RME HDSPM-MADI}}"); ...@@ -301,18 +301,6 @@ MODULE_SUPPORTED_DEVICE("{{RME HDSPM-MADI}}");
#define UNITY_GAIN 32768 /* = 65536/2 */ #define UNITY_GAIN 32768 /* = 65536/2 */
#define MINUS_INFINITY_GAIN 0 #define MINUS_INFINITY_GAIN 0
/* PCI info */
#ifndef PCI_VENDOR_ID_XILINX
#define PCI_VENDOR_ID_XILINX 0x10ee
#endif
#ifndef PCI_DEVICE_ID_XILINX_HAMMERFALL_DSP
#define PCI_DEVICE_ID_XILINX_HAMMERFALL_DSP 0x3fc5
#endif
#ifndef PCI_DEVICE_ID_XILINX_HAMMERFALL_DSP_MADI
#define PCI_DEVICE_ID_XILINX_HAMMERFALL_DSP_MADI 0x3fc6
#endif
/* Number of channels for different Speed Modes */ /* Number of channels for different Speed Modes */
#define MADI_SS_CHANNELS 64 #define MADI_SS_CHANNELS 64
#define MADI_DS_CHANNELS 32 #define MADI_DS_CHANNELS 32
......
sound/pci/rme9652/rme9652.c
浏览文件 @ 8cdfd251
...@@ -120,13 +120,6 @@ MODULE_SUPPORTED_DEVICE("{{RME,Hammerfall}," ...@@ -120,13 +120,6 @@ MODULE_SUPPORTED_DEVICE("{{RME,Hammerfall},"
#define RME9652_REV15_buf_pos(x) ((((x)&0xE0000000)>>26)|((x)&RME9652_buf_pos)) #define RME9652_REV15_buf_pos(x) ((((x)&0xE0000000)>>26)|((x)&RME9652_buf_pos))
#ifndef PCI_VENDOR_ID_XILINX
#define PCI_VENDOR_ID_XILINX 0x10ee
#endif
#ifndef PCI_DEVICE_ID_XILINX_HAMMERFALL
#define PCI_DEVICE_ID_XILINX_HAMMERFALL 0x3fc4
#endif
/* amount of io space we remap for register access. i'm not sure we /* amount of io space we remap for register access. i'm not sure we
even need this much, but 1K is nice round number :) even need this much, but 1K is nice round number :)
*/ */
......
sound/pci/sonicvibes.c
浏览文件 @ 8cdfd251
...@@ -50,13 +50,6 @@ MODULE_SUPPORTED_DEVICE("{{S3,SonicVibes PCI}}"); ...@@ -50,13 +50,6 @@ MODULE_SUPPORTED_DEVICE("{{S3,SonicVibes PCI}}");
#define SUPPORT_JOYSTICK 1 #define SUPPORT_JOYSTICK 1
#endif #endif
#ifndef PCI_VENDOR_ID_S3
#define PCI_VENDOR_ID_S3 0x5333
#endif
#ifndef PCI_DEVICE_ID_S3_SONICVIBES
#define PCI_DEVICE_ID_S3_SONICVIBES 0xca00
#endif
static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX; /* Index 0-MAX */ static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX; /* Index 0-MAX */
static char *id[SNDRV_CARDS] = SNDRV_DEFAULT_STR; /* ID for this card */ static char *id[SNDRV_CARDS] = SNDRV_DEFAULT_STR; /* ID for this card */
static int enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_PNP; /* Enable this card */ static int enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_PNP; /* Enable this card */
......
sound/pci/via82xx.c
浏览文件 @ 8cdfd251
...@@ -104,14 +104,6 @@ module_param_array(dxs_support, int, NULL, 0444); ...@@ -104,14 +104,6 @@ module_param_array(dxs_support, int, NULL, 0444);
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)"); 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)");
/* pci ids */
#ifndef PCI_DEVICE_ID_VIA_82C686_5
#define PCI_DEVICE_ID_VIA_82C686_5 0x3058
#endif
#ifndef PCI_DEVICE_ID_VIA_8233_5
#define PCI_DEVICE_ID_VIA_8233_5 0x3059
#endif
/* revision numbers for via686 */ /* revision numbers for via686 */
#define VIA_REV_686_A 0x10 #define VIA_REV_686_A 0x10
#define VIA_REV_686_B 0x11 #define VIA_REV_686_B 0x11
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或