Skip to content

L
linux
Commit 7291548d authored by Takashi Iwai's avatar Takashi Iwai Committed by Jaroslav Kysela
Browse files
Options

[ALSA] Rename pci_vendor/pci_device to pci_subvendor/pci_subdevice 

HDA Codec driver,HDA generic driver
Renamed pci_vendor/pci_device fields to pci_subvendor/pci_subdevice.
They are really PCI subsystem IDs.
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent fc20a562
Hide whitespace changes
Inline Side-by-side
Showing with 57 additions and 57 deletions
sound/pci/hda/hda_codec.c
View file @ 7291548d
...@@ -1530,7 +1530,7 @@ int snd_hda_check_board_config(struct hda_codec *codec, struct hda_board_config ...@@ -1530,7 +1530,7 @@ int snd_hda_check_board_config(struct hda_codec *codec, struct hda_board_config
struct hda_board_config *c; struct hda_board_config *c;
if (codec->bus->modelname) { if (codec->bus->modelname) {
for (c = tbl; c->modelname || c->pci_vendor; c++) { for (c = tbl; c->modelname || c->pci_subvendor; c++) {
if (c->modelname && if (c->modelname &&
! strcmp(codec->bus->modelname, c->modelname)) { ! strcmp(codec->bus->modelname, c->modelname)) {
snd_printd(KERN_INFO "hda_codec: model '%s' is selected\n", c->modelname); snd_printd(KERN_INFO "hda_codec: model '%s' is selected\n", c->modelname);
...@@ -1543,9 +1543,9 @@ int snd_hda_check_board_config(struct hda_codec *codec, struct hda_board_config ...@@ -1543,9 +1543,9 @@ int snd_hda_check_board_config(struct hda_codec *codec, struct hda_board_config
u16 subsystem_vendor, subsystem_device; u16 subsystem_vendor, subsystem_device;
pci_read_config_word(codec->bus->pci, PCI_SUBSYSTEM_VENDOR_ID, &subsystem_vendor); pci_read_config_word(codec->bus->pci, PCI_SUBSYSTEM_VENDOR_ID, &subsystem_vendor);
pci_read_config_word(codec->bus->pci, PCI_SUBSYSTEM_ID, &subsystem_device); pci_read_config_word(codec->bus->pci, PCI_SUBSYSTEM_ID, &subsystem_device);
for (c = tbl; c->modelname || c->pci_vendor; c++) { for (c = tbl; c->modelname || c->pci_subvendor; c++) {
if (c->pci_vendor == subsystem_vendor && if (c->pci_subvendor == subsystem_vendor &&
c->pci_device == subsystem_device) c->pci_subdevice == subsystem_device)
return c->config; return c->config;
} }
} }
......
sound/pci/hda/hda_local.h
View file @ 7291548d
...@@ -126,8 +126,8 @@ static inline int snd_hda_codec_proc_new(struct hda_codec *codec) { return 0; } ...@@ -126,8 +126,8 @@ static inline int snd_hda_codec_proc_new(struct hda_codec *codec) { return 0; }
struct hda_board_config { struct hda_board_config {
const char *modelname; const char *modelname;
int config; int config;
unsigned short pci_vendor; unsigned short pci_subvendor;
unsigned short pci_device; unsigned short pci_subdevice;
}; };
int snd_hda_check_board_config(struct hda_codec *codec, struct hda_board_config *tbl); int snd_hda_check_board_config(struct hda_codec *codec, struct hda_board_config *tbl);
......
sound/pci/hda/patch_realtek.c
View file @ 7291548d
...@@ -1261,74 +1261,74 @@ static struct hda_verb alc880_test_init_verbs[] = { ...@@ -1261,74 +1261,74 @@ static struct hda_verb alc880_test_init_verbs[] = {
static struct hda_board_config alc880_cfg_tbl[] = { static struct hda_board_config alc880_cfg_tbl[] = {
/* Back 3 jack, front 2 jack */ /* Back 3 jack, front 2 jack */
{ .modelname = "3stack", .config = ALC880_3ST }, { .modelname = "3stack", .config = ALC880_3ST },
{ .pci_vendor = 0x8086, .pci_device = 0xe200, .config = ALC880_3ST }, { .pci_subvendor = 0x8086, .pci_subdevice = 0xe200, .config = ALC880_3ST },
{ .pci_vendor = 0x8086, .pci_device = 0xe201, .config = ALC880_3ST }, { .pci_subvendor = 0x8086, .pci_subdevice = 0xe201, .config = ALC880_3ST },
{ .pci_vendor = 0x8086, .pci_device = 0xe202, .config = ALC880_3ST }, { .pci_subvendor = 0x8086, .pci_subdevice = 0xe202, .config = ALC880_3ST },
{ .pci_vendor = 0x8086, .pci_device = 0xe203, .config = ALC880_3ST }, { .pci_subvendor = 0x8086, .pci_subdevice = 0xe203, .config = ALC880_3ST },
{ .pci_vendor = 0x8086, .pci_device = 0xe204, .config = ALC880_3ST }, { .pci_subvendor = 0x8086, .pci_subdevice = 0xe204, .config = ALC880_3ST },
{ .pci_vendor = 0x8086, .pci_device = 0xe205, .config = ALC880_3ST }, { .pci_subvendor = 0x8086, .pci_subdevice = 0xe205, .config = ALC880_3ST },
{ .pci_vendor = 0x8086, .pci_device = 0xe206, .config = ALC880_3ST }, { .pci_subvendor = 0x8086, .pci_subdevice = 0xe206, .config = ALC880_3ST },
{ .pci_vendor = 0x8086, .pci_device = 0xe207, .config = ALC880_3ST }, { .pci_subvendor = 0x8086, .pci_subdevice = 0xe207, .config = ALC880_3ST },
{ .pci_vendor = 0x8086, .pci_device = 0xe208, .config = ALC880_3ST }, { .pci_subvendor = 0x8086, .pci_subdevice = 0xe208, .config = ALC880_3ST },
{ .pci_vendor = 0x8086, .pci_device = 0xe209, .config = ALC880_3ST }, { .pci_subvendor = 0x8086, .pci_subdevice = 0xe209, .config = ALC880_3ST },
{ .pci_vendor = 0x8086, .pci_device = 0xe20a, .config = ALC880_3ST }, { .pci_subvendor = 0x8086, .pci_subdevice = 0xe20a, .config = ALC880_3ST },
{ .pci_vendor = 0x8086, .pci_device = 0xe20b, .config = ALC880_3ST }, { .pci_subvendor = 0x8086, .pci_subdevice = 0xe20b, .config = ALC880_3ST },
{ .pci_vendor = 0x8086, .pci_device = 0xe20c, .config = ALC880_3ST }, { .pci_subvendor = 0x8086, .pci_subdevice = 0xe20c, .config = ALC880_3ST },
{ .pci_vendor = 0x8086, .pci_device = 0xe20d, .config = ALC880_3ST }, { .pci_subvendor = 0x8086, .pci_subdevice = 0xe20d, .config = ALC880_3ST },
{ .pci_vendor = 0x8086, .pci_device = 0xe20e, .config = ALC880_3ST }, { .pci_subvendor = 0x8086, .pci_subdevice = 0xe20e, .config = ALC880_3ST },
{ .pci_vendor = 0x8086, .pci_device = 0xe20f, .config = ALC880_3ST }, { .pci_subvendor = 0x8086, .pci_subdevice = 0xe20f, .config = ALC880_3ST },
{ .pci_vendor = 0x8086, .pci_device = 0xe210, .config = ALC880_3ST }, { .pci_subvendor = 0x8086, .pci_subdevice = 0xe210, .config = ALC880_3ST },
{ .pci_vendor = 0x8086, .pci_device = 0xe211, .config = ALC880_3ST }, { .pci_subvendor = 0x8086, .pci_subdevice = 0xe211, .config = ALC880_3ST },
{ .pci_vendor = 0x8086, .pci_device = 0xe214, .config = ALC880_3ST }, { .pci_subvendor = 0x8086, .pci_subdevice = 0xe214, .config = ALC880_3ST },
{ .pci_vendor = 0x8086, .pci_device = 0xe302, .config = ALC880_3ST }, { .pci_subvendor = 0x8086, .pci_subdevice = 0xe302, .config = ALC880_3ST },
{ .pci_vendor = 0x8086, .pci_device = 0xe303, .config = ALC880_3ST }, { .pci_subvendor = 0x8086, .pci_subdevice = 0xe303, .config = ALC880_3ST },
{ .pci_vendor = 0x8086, .pci_device = 0xe304, .config = ALC880_3ST }, { .pci_subvendor = 0x8086, .pci_subdevice = 0xe304, .config = ALC880_3ST },
{ .pci_vendor = 0x8086, .pci_device = 0xe306, .config = ALC880_3ST }, { .pci_subvendor = 0x8086, .pci_subdevice = 0xe306, .config = ALC880_3ST },
{ .pci_vendor = 0x8086, .pci_device = 0xe307, .config = ALC880_3ST }, { .pci_subvendor = 0x8086, .pci_subdevice = 0xe307, .config = ALC880_3ST },
{ .pci_vendor = 0x8086, .pci_device = 0xe404, .config = ALC880_3ST }, { .pci_subvendor = 0x8086, .pci_subdevice = 0xe404, .config = ALC880_3ST },
{ .pci_vendor = 0x8086, .pci_device = 0xa101, .config = ALC880_3ST }, { .pci_subvendor = 0x8086, .pci_subdevice = 0xa101, .config = ALC880_3ST },
{ .pci_vendor = 0x107b, .pci_device = 0x3031, .config = ALC880_3ST }, { .pci_subvendor = 0x107b, .pci_subdevice = 0x3031, .config = ALC880_3ST },
{ .pci_vendor = 0x107b, .pci_device = 0x4036, .config = ALC880_3ST }, { .pci_subvendor = 0x107b, .pci_subdevice = 0x4036, .config = ALC880_3ST },
{ .pci_vendor = 0x107b, .pci_device = 0x4037, .config = ALC880_3ST }, { .pci_subvendor = 0x107b, .pci_subdevice = 0x4037, .config = ALC880_3ST },
{ .pci_vendor = 0x107b, .pci_device = 0x4038, .config = ALC880_3ST }, { .pci_subvendor = 0x107b, .pci_subdevice = 0x4038, .config = ALC880_3ST },
{ .pci_vendor = 0x107b, .pci_device = 0x4040, .config = ALC880_3ST }, { .pci_subvendor = 0x107b, .pci_subdevice = 0x4040, .config = ALC880_3ST },
{ .pci_vendor = 0x107b, .pci_device = 0x4041, .config = ALC880_3ST }, { .pci_subvendor = 0x107b, .pci_subdevice = 0x4041, .config = ALC880_3ST },
/* Back 3 jack, front 2 jack (Internal add Aux-In) */ /* Back 3 jack, front 2 jack (Internal add Aux-In) */
{ .pci_vendor = 0x1025, .pci_device = 0xe310, .config = ALC880_3ST }, { .pci_subvendor = 0x1025, .pci_subdevice = 0xe310, .config = ALC880_3ST },
/* Back 3 jack plus 1 SPDIF out jack, front 2 jack */ /* Back 3 jack plus 1 SPDIF out jack, front 2 jack */
{ .modelname = "3stack-digout", .config = ALC880_3ST_DIG }, { .modelname = "3stack-digout", .config = ALC880_3ST_DIG },
{ .pci_vendor = 0x8086, .pci_device = 0xe308, .config = ALC880_3ST_DIG }, { .pci_subvendor = 0x8086, .pci_subdevice = 0xe308, .config = ALC880_3ST_DIG },
/* Back 3 jack plus 1 SPDIF out jack, front 2 jack (Internal add Aux-In)*/ /* Back 3 jack plus 1 SPDIF out jack, front 2 jack (Internal add Aux-In)*/
{ .pci_vendor = 0x8086, .pci_device = 0xe305, .config = ALC880_3ST_DIG }, { .pci_subvendor = 0x8086, .pci_subdevice = 0xe305, .config = ALC880_3ST_DIG },
{ .pci_vendor = 0x8086, .pci_device = 0xd402, .config = ALC880_3ST_DIG }, { .pci_subvendor = 0x8086, .pci_subdevice = 0xd402, .config = ALC880_3ST_DIG },
{ .pci_vendor = 0x1025, .pci_device = 0xe309, .config = ALC880_3ST_DIG }, { .pci_subvendor = 0x1025, .pci_subdevice = 0xe309, .config = ALC880_3ST_DIG },
/* Back 5 jack, front 2 jack */ /* Back 5 jack, front 2 jack */
{ .modelname = "5stack", .config = ALC880_5ST }, { .modelname = "5stack", .config = ALC880_5ST },
{ .pci_vendor = 0x107b, .pci_device = 0x3033, .config = ALC880_5ST }, { .pci_subvendor = 0x107b, .pci_subdevice = 0x3033, .config = ALC880_5ST },
{ .pci_vendor = 0x107b, .pci_device = 0x4039, .config = ALC880_5ST }, { .pci_subvendor = 0x107b, .pci_subdevice = 0x4039, .config = ALC880_5ST },
{ .pci_vendor = 0x107b, .pci_device = 0x3032, .config = ALC880_5ST }, { .pci_subvendor = 0x107b, .pci_subdevice = 0x3032, .config = ALC880_5ST },
{ .pci_vendor = 0x103c, .pci_device = 0x2a09, .config = ALC880_5ST }, { .pci_subvendor = 0x103c, .pci_subdevice = 0x2a09, .config = ALC880_5ST },
/* Back 5 jack plus 1 SPDIF out jack, front 2 jack */ /* Back 5 jack plus 1 SPDIF out jack, front 2 jack */
{ .modelname = "5stack-digout", .config = ALC880_5ST_DIG }, { .modelname = "5stack-digout", .config = ALC880_5ST_DIG },
{ .pci_vendor = 0x8086, .pci_device = 0xe224, .config = ALC880_5ST_DIG }, { .pci_subvendor = 0x8086, .pci_subdevice = 0xe224, .config = ALC880_5ST_DIG },
{ .pci_vendor = 0x8086, .pci_device = 0xe400, .config = ALC880_5ST_DIG }, { .pci_subvendor = 0x8086, .pci_subdevice = 0xe400, .config = ALC880_5ST_DIG },
{ .pci_vendor = 0x8086, .pci_device = 0xe401, .config = ALC880_5ST_DIG }, { .pci_subvendor = 0x8086, .pci_subdevice = 0xe401, .config = ALC880_5ST_DIG },
{ .pci_vendor = 0x8086, .pci_device = 0xe402, .config = ALC880_5ST_DIG }, { .pci_subvendor = 0x8086, .pci_subdevice = 0xe402, .config = ALC880_5ST_DIG },
{ .pci_vendor = 0x8086, .pci_device = 0xd400, .config = ALC880_5ST_DIG }, { .pci_subvendor = 0x8086, .pci_subdevice = 0xd400, .config = ALC880_5ST_DIG },
{ .pci_vendor = 0x8086, .pci_device = 0xd401, .config = ALC880_5ST_DIG }, { .pci_subvendor = 0x8086, .pci_subdevice = 0xd401, .config = ALC880_5ST_DIG },
{ .pci_vendor = 0x8086, .pci_device = 0xa100, .config = ALC880_5ST_DIG }, { .pci_subvendor = 0x8086, .pci_subdevice = 0xa100, .config = ALC880_5ST_DIG },
{ .pci_vendor = 0x1565, .pci_device = 0x8202, .config = ALC880_5ST_DIG }, { .pci_subvendor = 0x1565, .pci_subdevice = 0x8202, .config = ALC880_5ST_DIG },
{ .modelname = "w810", .config = ALC880_W810 }, { .modelname = "w810", .config = ALC880_W810 },
{ .pci_vendor = 0x161f, .pci_device = 0x203d, .config = ALC880_W810 }, { .pci_subvendor = 0x161f, .pci_subdevice = 0x203d, .config = ALC880_W810 },
{ .modelname = "z71v", .config = ALC880_Z71V }, { .modelname = "z71v", .config = ALC880_Z71V },
{ .pci_vendor = 0x1043, .pci_device = 0x1964, .config = ALC880_Z71V }, { .pci_subvendor = 0x1043, .pci_subdevice = 0x1964, .config = ALC880_Z71V },
#ifdef CONFIG_SND_DEBUG #ifdef CONFIG_SND_DEBUG
{ .modelname = "test", .config = ALC880_TEST }, { .modelname = "test", .config = ALC880_TEST },
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7