[ALSA] Rename pci_vendor/pci_device to pci_subvendor/pci_subdevice [Linux 2.6.13]

This Linux kernel change "[ALSA] Rename pci_vendor/pci_device to pci_subvendor/pci_subdevice" is included in the Linux 2.6.13 release. This change is authored by Takashi Iwai <tiwai [at] suse.de> on Thu May 12 16:49:45 2005 +0200. The commit for this change in Linux stable tree is 7291548 (patch).

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

There are 114 lines of Linux source code added/deleted in this change. Code changes to Linux kernel are as follows.

 sound/pci/hda/hda_codec.c     |   8 ++--
 sound/pci/hda/hda_local.h     |   4 +-
 sound/pci/hda/patch_realtek.c | 102 +++++++++++++++++++++---------------------
 3 files changed, 57 insertions(+), 57 deletions(-)

diff --git a/sound/pci/hda/hda_codec.c b/sound/pci/hda/hda_codec.c
index 44fac21..87018dfd 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
    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 selectedn", 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 7c7b849..b8fbbc4 100644
--- a/sound/pci/hda/hda_local.h
+++ b/sound/pci/hda/hda_local.h
@@ -126,8 +126,8 @@ int snd_hda_multi_out_analog_prepare(struct hda_codec *codec, struct hda_multi_o
 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 75ec197..8a10482 100644
--- a/sound/pci/hda/patch_realtek.c
+++ b/sound/pci/hda/patch_realtek.c
@@ -1261,74 +1261,74 @@ static int alc_test_pin_src_put(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t *
 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 },

Leave a Reply

Your email address will not be published. Required fields are marked *