aboutsummaryrefslogtreecommitdiffstats
path: root/sound/pci/hda/hda_codec.c
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2005-05-12 10:49:45 -0400
committerJaroslav Kysela <perex@suse.cz>2005-05-29 04:08:46 -0400
commit7291548df69ab4e3a87ff6952449d1f05c3a5443 (patch)
tree535e92082d3b1a5b4ef40c3ca3aae71329eee481 /sound/pci/hda/hda_codec.c
parentfc20a562ca1a3c22dc257b2e2d849cb1a9ab6420 (diff)
[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: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci/hda/hda_codec.c')
-rw-r--r--sound/pci/hda/hda_codec.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/sound/pci/hda/hda_codec.c b/sound/pci/hda/hda_codec.c
index 44fac2182fcc..87018dfd02f7 100644
--- a/sound/pci/hda/hda_codec.c
+++ b/sound/pci/hda/hda_codec.c
@@ -1530,7 +1530,7 @@ int snd_hda_check_board_config(struct hda_codec *codec, struct hda_board_config
1530 struct hda_board_config *c; 1530 struct hda_board_config *c;
1531 1531
1532 if (codec->bus->modelname) { 1532 if (codec->bus->modelname) {
1533 for (c = tbl; c->modelname || c->pci_vendor; c++) { 1533 for (c = tbl; c->modelname || c->pci_subvendor; c++) {
1534 if (c->modelname && 1534 if (c->modelname &&
1535 ! strcmp(codec->bus->modelname, c->modelname)) { 1535 ! strcmp(codec->bus->modelname, c->modelname)) {
1536 snd_printd(KERN_INFO "hda_codec: model '%s' is selected\n", c->modelname); 1536 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 u16 subsystem_vendor, subsystem_device; 1543 u16 subsystem_vendor, subsystem_device;
1544 pci_read_config_word(codec->bus->pci, PCI_SUBSYSTEM_VENDOR_ID, &subsystem_vendor); 1544 pci_read_config_word(codec->bus->pci, PCI_SUBSYSTEM_VENDOR_ID, &subsystem_vendor);
1545 pci_read_config_word(codec->bus->pci, PCI_SUBSYSTEM_ID, &subsystem_device); 1545 pci_read_config_word(codec->bus->pci, PCI_SUBSYSTEM_ID, &subsystem_device);
1546 for (c = tbl; c->modelname || c->pci_vendor; c++) { 1546 for (c = tbl; c->modelname || c->pci_subvendor; c++) {
1547 if (c->pci_vendor == subsystem_vendor && 1547 if (c->pci_subvendor == subsystem_vendor &&
1548 c->pci_device == subsystem_device) 1548 c->pci_subdevice == subsystem_device)
1549 return c->config; 1549 return c->config;
1550 } 1550 }
1551 } 1551 }