[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>

diff --git a/sound/pci/hda/hda_codec.c b/sound/pci/hda/hda_codec.c
index 44fac2182fcc913e85d8a3478df55941207c960b..87018dfd02f71b90d40ba19f630c902fecff6eb0 100644 (file)
--- 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
        struct hda_board_config *c;
 
        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 &&
                            ! strcmp(codec->bus->modelname, 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
                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_ID, &subsystem_device);
-               for (c = tbl; c->modelname || c->pci_vendor; c++) {
-                       if (c->pci_vendor == subsystem_vendor &&
-                           c->pci_device == subsystem_device)
+               for (c = tbl; c->modelname || c->pci_subvendor; c++) {
+                       if (c->pci_subvendor == subsystem_vendor &&
+                           c->pci_subdevice == subsystem_device)
                                return c->config;
                }
        }

diff --git a/sound/pci/hda/hda_local.h b/sound/pci/hda/hda_local.h
index 7c7b849875a0015a2c4e7878d3744d1d8b2920a8..b8fbbc4901d9fb3f9a157760818e341f20f057f1 100644 (file)
--- a/sound/pci/hda/hda_local.h
+++ b/sound/pci/hda/hda_local.h
@@ -126,8 +126,8 @@ static inline int snd_hda_codec_proc_new(struct hda_codec *codec) { return 0; }
 struct hda_board_config {
        const char *modelname;
        int config;
-       unsigned short pci_vendor;
-       unsigned short pci_device;
+       unsigned short pci_subvendor;
+       unsigned short pci_subdevice;
 };
 
 int snd_hda_check_board_config(struct hda_codec *codec, struct hda_board_config *tbl);

diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c
index 75ec1970cc0acad46922103b952c69ff583b21b8..8a104827a95c1581cf710da9c1d27b3b49fa882d 100644 (file)
--- a/sound/pci/hda/patch_realtek.c
+++ b/sound/pci/hda/patch_realtek.c
@@ -1261,74 +1261,74 @@ static struct hda_verb alc880_test_init_verbs[] = {
 static struct hda_board_config alc880_cfg_tbl[] = {
        /* Back 3 jack, front 2 jack */
        { .modelname = "3stack", .config = ALC880_3ST },
-       { .pci_vendor = 0x8086, .pci_device = 0xe200, .config = ALC880_3ST },
-       { .pci_vendor = 0x8086, .pci_device = 0xe201, .config = ALC880_3ST },
-       { .pci_vendor = 0x8086, .pci_device = 0xe202, .config = ALC880_3ST },
-       { .pci_vendor = 0x8086, .pci_device = 0xe203, .config = ALC880_3ST },
-       { .pci_vendor = 0x8086, .pci_device = 0xe204, .config = ALC880_3ST },
-       { .pci_vendor = 0x8086, .pci_device = 0xe205, .config = ALC880_3ST },
-       { .pci_vendor = 0x8086, .pci_device = 0xe206, .config = ALC880_3ST },
-       { .pci_vendor = 0x8086, .pci_device = 0xe207, .config = ALC880_3ST },
-       { .pci_vendor = 0x8086, .pci_device = 0xe208, .config = ALC880_3ST },
-       { .pci_vendor = 0x8086, .pci_device = 0xe209, .config = ALC880_3ST },
-       { .pci_vendor = 0x8086, .pci_device = 0xe20a, .config = ALC880_3ST },
-       { .pci_vendor = 0x8086, .pci_device = 0xe20b, .config = ALC880_3ST },
-       { .pci_vendor = 0x8086, .pci_device = 0xe20c, .config = ALC880_3ST },
-       { .pci_vendor = 0x8086, .pci_device = 0xe20d, .config = ALC880_3ST },
-       { .pci_vendor = 0x8086, .pci_device = 0xe20e, .config = ALC880_3ST },
-       { .pci_vendor = 0x8086, .pci_device = 0xe20f, .config = ALC880_3ST },
-       { .pci_vendor = 0x8086, .pci_device = 0xe210, .config = ALC880_3ST },
-       { .pci_vendor = 0x8086, .pci_device = 0xe211, .config = ALC880_3ST },
-       { .pci_vendor = 0x8086, .pci_device = 0xe214, .config = ALC880_3ST },
-       { .pci_vendor = 0x8086, .pci_device = 0xe302, .config = ALC880_3ST },
-       { .pci_vendor = 0x8086, .pci_device = 0xe303, .config = ALC880_3ST },
-       { .pci_vendor = 0x8086, .pci_device = 0xe304, .config = ALC880_3ST },
-       { .pci_vendor = 0x8086, .pci_device = 0xe306, .config = ALC880_3ST },
-       { .pci_vendor = 0x8086, .pci_device = 0xe307, .config = ALC880_3ST },
-       { .pci_vendor = 0x8086, .pci_device = 0xe404, .config = ALC880_3ST },
-       { .pci_vendor = 0x8086, .pci_device = 0xa101, .config = ALC880_3ST },
-       { .pci_vendor = 0x107b, .pci_device = 0x3031, .config = ALC880_3ST },
-       { .pci_vendor = 0x107b, .pci_device = 0x4036, .config = ALC880_3ST },
-       { .pci_vendor = 0x107b, .pci_device = 0x4037, .config = ALC880_3ST },
-       { .pci_vendor = 0x107b, .pci_device = 0x4038, .config = ALC880_3ST },
-       { .pci_vendor = 0x107b, .pci_device = 0x4040, .config = ALC880_3ST },
-       { .pci_vendor = 0x107b, .pci_device = 0x4041, .config = ALC880_3ST },
+       { .pci_subvendor = 0x8086, .pci_subdevice = 0xe200, .config = ALC880_3ST },
+       { .pci_subvendor = 0x8086, .pci_subdevice = 0xe201, .config = ALC880_3ST },
+       { .pci_subvendor = 0x8086, .pci_subdevice = 0xe202, .config = ALC880_3ST },
+       { .pci_subvendor = 0x8086, .pci_subdevice = 0xe203, .config = ALC880_3ST },
+       { .pci_subvendor = 0x8086, .pci_subdevice = 0xe204, .config = ALC880_3ST },
+       { .pci_subvendor = 0x8086, .pci_subdevice = 0xe205, .config = ALC880_3ST },
+       { .pci_subvendor = 0x8086, .pci_subdevice = 0xe206, .config = ALC880_3ST },
+       { .pci_subvendor = 0x8086, .pci_subdevice = 0xe207, .config = ALC880_3ST },
+       { .pci_subvendor = 0x8086, .pci_subdevice = 0xe208, .config = ALC880_3ST },
+       { .pci_subvendor = 0x8086, .pci_subdevice = 0xe209, .config = ALC880_3ST },
+       { .pci_subvendor = 0x8086, .pci_subdevice = 0xe20a, .config = ALC880_3ST },
+       { .pci_subvendor = 0x8086, .pci_subdevice = 0xe20b, .config = ALC880_3ST },
+       { .pci_subvendor = 0x8086, .pci_subdevice = 0xe20c, .config = ALC880_3ST },
+       { .pci_subvendor = 0x8086, .pci_subdevice = 0xe20d, .config = ALC880_3ST },
+       { .pci_subvendor = 0x8086, .pci_subdevice = 0xe20e, .config = ALC880_3ST },
+       { .pci_subvendor = 0x8086, .pci_subdevice = 0xe20f, .config = ALC880_3ST },
+       { .pci_subvendor = 0x8086, .pci_subdevice = 0xe210, .config = ALC880_3ST },
+       { .pci_subvendor = 0x8086, .pci_subdevice = 0xe211, .config = ALC880_3ST },
+       { .pci_subvendor = 0x8086, .pci_subdevice = 0xe214, .config = ALC880_3ST },
+       { .pci_subvendor = 0x8086, .pci_subdevice = 0xe302, .config = ALC880_3ST },
+       { .pci_subvendor = 0x8086, .pci_subdevice = 0xe303, .config = ALC880_3ST },
+       { .pci_subvendor = 0x8086, .pci_subdevice = 0xe304, .config = ALC880_3ST },
+       { .pci_subvendor = 0x8086, .pci_subdevice = 0xe306, .config = ALC880_3ST },
+       { .pci_subvendor = 0x8086, .pci_subdevice = 0xe307, .config = ALC880_3ST },
+       { .pci_subvendor = 0x8086, .pci_subdevice = 0xe404, .config = ALC880_3ST },
+       { .pci_subvendor = 0x8086, .pci_subdevice = 0xa101, .config = ALC880_3ST },
+       { .pci_subvendor = 0x107b, .pci_subdevice = 0x3031, .config = ALC880_3ST },
+       { .pci_subvendor = 0x107b, .pci_subdevice = 0x4036, .config = ALC880_3ST },
+       { .pci_subvendor = 0x107b, .pci_subdevice = 0x4037, .config = ALC880_3ST },
+       { .pci_subvendor = 0x107b, .pci_subdevice = 0x4038, .config = ALC880_3ST },
+       { .pci_subvendor = 0x107b, .pci_subdevice = 0x4040, .config = ALC880_3ST },
+       { .pci_subvendor = 0x107b, .pci_subdevice = 0x4041, .config = ALC880_3ST },
 
        /* 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 */
        { .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)*/
-       { .pci_vendor = 0x8086, .pci_device = 0xe305, .config = ALC880_3ST_DIG },
-       { .pci_vendor = 0x8086, .pci_device = 0xd402, .config = ALC880_3ST_DIG },
-       { .pci_vendor = 0x1025, .pci_device = 0xe309, .config = ALC880_3ST_DIG },
+       { .pci_subvendor = 0x8086, .pci_subdevice = 0xe305, .config = ALC880_3ST_DIG },
+       { .pci_subvendor = 0x8086, .pci_subdevice = 0xd402, .config = ALC880_3ST_DIG },
+       { .pci_subvendor = 0x1025, .pci_subdevice = 0xe309, .config = ALC880_3ST_DIG },
 
        /* Back 5 jack, front 2 jack */
        { .modelname = "5stack", .config = ALC880_5ST },
-       { .pci_vendor = 0x107b, .pci_device = 0x3033, .config = ALC880_5ST },
-       { .pci_vendor = 0x107b, .pci_device = 0x4039, .config = ALC880_5ST },
-       { .pci_vendor = 0x107b, .pci_device = 0x3032, .config = ALC880_5ST },
-       { .pci_vendor = 0x103c, .pci_device = 0x2a09, .config = ALC880_5ST },
+       { .pci_subvendor = 0x107b, .pci_subdevice = 0x3033, .config = ALC880_5ST },
+       { .pci_subvendor = 0x107b, .pci_subdevice = 0x4039, .config = ALC880_5ST },
+       { .pci_subvendor = 0x107b, .pci_subdevice = 0x3032, .config = ALC880_5ST },
+       { .pci_subvendor = 0x103c, .pci_subdevice = 0x2a09, .config = ALC880_5ST },
 
        /* Back 5 jack plus 1 SPDIF out jack, front 2 jack */
        { .modelname = "5stack-digout", .config = ALC880_5ST_DIG },
-       { .pci_vendor = 0x8086, .pci_device = 0xe224, .config = ALC880_5ST_DIG },
-       { .pci_vendor = 0x8086, .pci_device = 0xe400, .config = ALC880_5ST_DIG },
-       { .pci_vendor = 0x8086, .pci_device = 0xe401, .config = ALC880_5ST_DIG },
-       { .pci_vendor = 0x8086, .pci_device = 0xe402, .config = ALC880_5ST_DIG },
-       { .pci_vendor = 0x8086, .pci_device = 0xd400, .config = ALC880_5ST_DIG },
-       { .pci_vendor = 0x8086, .pci_device = 0xd401, .config = ALC880_5ST_DIG },
-       { .pci_vendor = 0x8086, .pci_device = 0xa100, .config = ALC880_5ST_DIG },
-       { .pci_vendor = 0x1565, .pci_device = 0x8202, .config = ALC880_5ST_DIG },
+       { .pci_subvendor = 0x8086, .pci_subdevice = 0xe224, .config = ALC880_5ST_DIG },
+       { .pci_subvendor = 0x8086, .pci_subdevice = 0xe400, .config = ALC880_5ST_DIG },
+       { .pci_subvendor = 0x8086, .pci_subdevice = 0xe401, .config = ALC880_5ST_DIG },
+       { .pci_subvendor = 0x8086, .pci_subdevice = 0xe402, .config = ALC880_5ST_DIG },
+       { .pci_subvendor = 0x8086, .pci_subdevice = 0xd400, .config = ALC880_5ST_DIG },
+       { .pci_subvendor = 0x8086, .pci_subdevice = 0xd401, .config = ALC880_5ST_DIG },
+       { .pci_subvendor = 0x8086, .pci_subdevice = 0xa100, .config = ALC880_5ST_DIG },
+       { .pci_subvendor = 0x1565, .pci_subdevice = 0x8202, .config = ALC880_5ST_DIG },
 
        { .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 },
-       { .pci_vendor = 0x1043, .pci_device = 0x1964, .config = ALC880_Z71V },
+       { .pci_subvendor = 0x1043, .pci_subdevice = 0x1964, .config = ALC880_Z71V },
 
 #ifdef CONFIG_SND_DEBUG
        { .modelname = "test", .config = ALC880_TEST },