15 files changed, 21 insertions, 42 deletions

diff --git a/sound/oss/emu10k1/main.c b/sound/oss/emu10k1/main.c
index 16ac02540a3f..5058411b7524 100644
--- a/sound/oss/emu10k1/main.c
+++ b/sound/oss/emu10k1/main.c
@@ -1302,7 +1302,7 @@ static int __devinit emu10k1_probe(struct pci_dev *pci_dev, const struct pci_dev
                 goto err_irq;
         }
 
-        pci_read_config_byte(pci_dev, PCI_REVISION_ID, &card->chiprev);
+        card->chiprev = pci_dev->revision;
         pci_read_config_word(pci_dev, PCI_SUBSYSTEM_ID, &card->model);
 
         printk(KERN_INFO "emu10k1: %s rev %d model %#04x found, IO at %#04lx-%#04lx, IRQ %d\n",
diff --git a/sound/oss/es1371.c b/sound/oss/es1371.c
index 593a3aac12ce..52648573f601 100644
--- a/sound/oss/es1371.c
+++ b/sound/oss/es1371.c
@@ -2894,7 +2894,7 @@ static int __devinit es1371_probe(struct pci_dev *pcidev, const struct pci_devic
         s->irq = pcidev->irq;
         s->vendor = pcidev->vendor;
         s->device = pcidev->device;
-        pci_read_config_byte(pcidev, PCI_REVISION_ID, &s->rev);
+        s->rev = pcidev->revision;
         s->codec->private_data = s;
         s->codec->id = 0;
         s->codec->codec_read = rdcodec;
diff --git a/sound/pci/ali5451/ali5451.c b/sound/pci/ali5451/ali5451.c
index cb59f994c68f..41543a4933e7 100644
--- a/sound/pci/ali5451/ali5451.c
+++ b/sound/pci/ali5451/ali5451.c
@@ -2218,7 +2218,7 @@ static int __devinit snd_ali_create(struct snd_card *card,
         codec->card = card;
         codec->pci = pci;
         codec->irq = -1;
-        pci_read_config_byte(pci, PCI_REVISION_ID, &codec->revision);
+        codec->revision = pci->revision;
         codec->spdif_support = spdif_support;
 
         if (pcm_streams < 1)
diff --git a/sound/pci/atiixp.c b/sound/pci/atiixp.c
index 7d8053b5e8d5..89184a424140 100644
--- a/sound/pci/atiixp.c
+++ b/sound/pci/atiixp.c
@@ -1639,15 +1639,12 @@ static int __devinit snd_atiixp_probe(struct pci_dev *pci,
 {
         struct snd_card *card;
         struct atiixp *chip;
-        unsigned char revision;
         int err;
 
         card = snd_card_new(index, id, THIS_MODULE, 0);
         if (card == NULL)
                 return -ENOMEM;
 
-        pci_read_config_byte(pci, PCI_REVISION_ID, &revision);
-
         strcpy(card->driver, spdif_aclink ? "ATIIXP" : "ATIIXP-SPDMA");
         strcpy(card->shortname, "ATI IXP");
         if ((err = snd_atiixp_create(card, pci, &chip)) < 0)
@@ -1670,7 +1667,8 @@ static int __devinit snd_atiixp_probe(struct pci_dev *pci,
         snd_atiixp_chip_start(chip);
 
         snprintf(card->longname, sizeof(card->longname),
-                 "%s rev %x with %s at %#lx, irq %i", card->shortname, revision,
+                 "%s rev %x with %s at %#lx, irq %i", card->shortname,
+                 pci->revision,
                  chip->ac97[0] ? snd_ac97_get_short_name(chip->ac97[0]) : "?",
                  chip->addr, chip->irq);
 
diff --git a/sound/pci/atiixp_modem.c b/sound/pci/atiixp_modem.c
index 904023fe4f26..ce752f84457a 100644
--- a/sound/pci/atiixp_modem.c
+++ b/sound/pci/atiixp_modem.c
@@ -1283,15 +1283,12 @@ static int __devinit snd_atiixp_probe(struct pci_dev *pci,
 {
         struct snd_card *card;
         struct atiixp_modem *chip;
-        unsigned char revision;
         int err;
 
         card = snd_card_new(index, id, THIS_MODULE, 0);
         if (card == NULL)
                 return -ENOMEM;
 
-        pci_read_config_byte(pci, PCI_REVISION_ID, &revision);
-
         strcpy(card->driver, "ATIIXP-MODEM");
         strcpy(card->shortname, "ATI IXP Modem");
         if ((err = snd_atiixp_create(card, pci, &chip)) < 0)
@@ -1312,7 +1309,7 @@ static int __devinit snd_atiixp_probe(struct pci_dev *pci,
         snd_atiixp_chip_start(chip);
 
         sprintf(card->longname, "%s rev %x at 0x%lx, irq %i",
-                card->shortname, revision, chip->addr, chip->irq);
+                card->shortname, pci->revision, chip->addr, chip->irq);
 
         if ((err = snd_card_register(card)) < 0)
                 goto __error;
diff --git a/sound/pci/au88x0/au88x0.c b/sound/pci/au88x0/au88x0.c
index 238154bb7a25..5ec1b6fcd548 100644
--- a/sound/pci/au88x0/au88x0.c
+++ b/sound/pci/au88x0/au88x0.c
@@ -341,11 +341,7 @@ snd_vortex_probe(struct pci_dev *pci, const struct pci_device_id *pci_id)
                 snd_card_free(card);
                 return err;
         }
-        if ((err = pci_read_config_byte(pci, PCI_REVISION_ID,
-                                  &(chip->rev))) < 0) {
-                snd_card_free(card);
-                return err;
-        }
+        chip->rev = pci->revision;
 #ifdef CHIP_AU8830
         if ((chip->rev) != 0xfe && (chip->rev) != 0xfa) {
                 printk(KERN_ALERT
diff --git a/sound/pci/ca0106/ca0106.h b/sound/pci/ca0106/ca0106.h
index aaac6e5b4767..a0420bc63f0b 100644
--- a/sound/pci/ca0106/ca0106.h
+++ b/sound/pci/ca0106/ca0106.h
@@ -590,7 +590,6 @@ struct snd_ca0106 {
         struct resource *res_port;
         int irq;
 
-        unsigned char revision;         /* chip revision */
         unsigned int serial;            /* serial number */
         unsigned short model;           /* subsystem id */
 
diff --git a/sound/pci/ca0106/ca0106_main.c b/sound/pci/ca0106/ca0106_main.c
index 48f3f17c5170..9fd7b8a5b75e 100644
--- a/sound/pci/ca0106/ca0106_main.c
+++ b/sound/pci/ca0106/ca0106_main.c
@@ -1293,13 +1293,12 @@ static int __devinit snd_ca0106_create(int dev, struct snd_card *card,
         }
 
         pci_set_master(pci);
-        /* read revision & serial */
-        pci_read_config_byte(pci, PCI_REVISION_ID, &chip->revision);
+        /* read serial */
         pci_read_config_dword(pci, PCI_SUBSYSTEM_VENDOR_ID, &chip->serial);
         pci_read_config_word(pci, PCI_SUBSYSTEM_ID, &chip->model);
 #if 1
         printk(KERN_INFO "snd-ca0106: Model %04x Rev %08x Serial %08x\n", chip->model,
-               chip->revision, chip->serial);
+               pci->revision, chip->serial);
 #endif
         strcpy(card->driver, "CA0106");
         strcpy(card->shortname, "CA0106");
diff --git a/sound/pci/emu10k1/emu10k1_main.c b/sound/pci/emu10k1/emu10k1_main.c
index dbc805c33fc4..4a9b59ad8ab1 100644
--- a/sound/pci/emu10k1/emu10k1_main.c
+++ b/sound/pci/emu10k1/emu10k1_main.c
@@ -1511,7 +1511,6 @@ int __devinit snd_emu10k1_create(struct snd_card *card,
         struct snd_emu10k1 *emu;
         int idx, err;
         int is_audigy;
-        unsigned char revision;
         unsigned int silent_page;
         const struct snd_emu_chip_details *c;
         static struct snd_device_ops ops = {
@@ -1543,8 +1542,7 @@ int __devinit snd_emu10k1_create(struct snd_card *card,
         emu->synth = NULL;
         emu->get_synth_voice = NULL;
         /* read revision & serial */
-        pci_read_config_byte(pci, PCI_REVISION_ID, &revision);
-        emu->revision = revision;
+        emu->revision = pci->revision;
         pci_read_config_dword(pci, PCI_SUBSYSTEM_VENDOR_ID, &emu->serial);
         pci_read_config_word(pci, PCI_SUBSYSTEM_ID, &emu->model);
         snd_printdd("vendor=0x%x, device=0x%x, subsystem_vendor_id=0x%x, subsystem_id=0x%x\n",pci->vendor, pci->device, emu->serial, emu->model);
diff --git a/sound/pci/emu10k1/emu10k1x.c b/sound/pci/emu10k1/emu10k1x.c
index bb0fec7f7e1b..e4af7a9b808c 100644
--- a/sound/pci/emu10k1/emu10k1x.c
+++ b/sound/pci/emu10k1/emu10k1x.c
@@ -942,7 +942,7 @@ static int __devinit snd_emu10k1x_create(struct snd_card *card,
 
         pci_set_master(pci);
         /* read revision & serial */
-        pci_read_config_byte(pci, PCI_REVISION_ID, &chip->revision);
+        chip->revision = pci->revision;
         pci_read_config_dword(pci, PCI_SUBSYSTEM_VENDOR_ID, &chip->serial);
         pci_read_config_word(pci, PCI_SUBSYSTEM_ID, &chip->model);
         snd_printk(KERN_INFO "Model %04x Rev %08x Serial %08x\n", chip->model,
diff --git a/sound/pci/ens1370.c b/sound/pci/ens1370.c
index 6a0ddcf00884..7c403965153b 100644
--- a/sound/pci/ens1370.c
+++ b/sound/pci/ens1370.c
@@ -2110,7 +2110,6 @@ static int __devinit snd_ensoniq_create(struct snd_card *card,
                                      struct ensoniq ** rensoniq)
 {
         struct ensoniq *ensoniq;
-        unsigned char cmdb;
         int err;
         static struct snd_device_ops ops = {
                 .dev_free =     snd_ensoniq_dev_free,
@@ -2151,8 +2150,7 @@ static int __devinit snd_ensoniq_create(struct snd_card *card,
         }
 #endif
         pci_set_master(pci);
-        pci_read_config_byte(pci, PCI_REVISION_ID, &cmdb);
-        ensoniq->rev = cmdb;
+        ensoniq->rev = pci->revision;
 #ifdef CHIP1370
 #if 0
         ensoniq->ctrl = ES_1370_CDC_EN | ES_1370_SERR_DISABLE |
diff --git a/sound/pci/fm801.c b/sound/pci/fm801.c
index 6dc578bbeec9..11015178e207 100644
--- a/sound/pci/fm801.c
+++ b/sound/pci/fm801.c
@@ -1369,7 +1369,6 @@ static int __devinit snd_fm801_create(struct snd_card *card,
                                       struct fm801 ** rchip)
 {
         struct fm801 *chip;
-        unsigned char rev;
         int err;
         static struct snd_device_ops ops = {
                 .dev_free =     snd_fm801_dev_free,
@@ -1405,8 +1404,7 @@ static int __devinit snd_fm801_create(struct snd_card *card,
                 pci_set_master(pci);
         }
 
-        pci_read_config_byte(pci, PCI_REVISION_ID, &rev);
-        if (rev >= 0xb1)        /* FM801-AU */
+        if (pci->revision >= 0xb1)      /* FM801-AU */
                 chip->multichannel = 1;
 
         snd_fm801_chip_init(chip, 0);
diff --git a/sound/pci/via82xx.c b/sound/pci/via82xx.c
index a28992269f5e..50c9f92cfd1b 100644
--- a/sound/pci/via82xx.c
+++ b/sound/pci/via82xx.c
@@ -2431,7 +2431,6 @@ static int __devinit snd_via82xx_probe(struct pci_dev *pci,
 {
         struct snd_card *card;
         struct via82xx *chip;
-        unsigned char revision;
         int chip_type = 0, card_type;
         unsigned int i;
         int err;
@@ -2441,18 +2440,17 @@ static int __devinit snd_via82xx_probe(struct pci_dev *pci,
                 return -ENOMEM;
 
         card_type = pci_id->driver_data;
-        pci_read_config_byte(pci, PCI_REVISION_ID, &revision);
         switch (card_type) {
         case TYPE_CARD_VIA686:
                 strcpy(card->driver, "VIA686A");
-                sprintf(card->shortname, "VIA 82C686A/B rev%x", revision);
+                sprintf(card->shortname, "VIA 82C686A/B rev%x", pci->revision);
                 chip_type = TYPE_VIA686;
                 break;
         case TYPE_CARD_VIA8233:
                 chip_type = TYPE_VIA8233;
-                sprintf(card->shortname, "VIA 823x rev%x", revision);
+                sprintf(card->shortname, "VIA 823x rev%x", pci->revision);
                 for (i = 0; i < ARRAY_SIZE(via823x_cards); i++) {
-                        if (revision == via823x_cards[i].revision) {
+                        if (pci->revision == via823x_cards[i].revision) {
                                 chip_type = via823x_cards[i].type;
                                 strcpy(card->shortname, via823x_cards[i].name);
                                 break;
@@ -2460,7 +2458,7 @@ static int __devinit snd_via82xx_probe(struct pci_dev *pci,
                 }
                 if (chip_type != TYPE_VIA8233A) {
                         if (dxs_support == VIA_DXS_AUTO)
-                                dxs_support = check_dxs_list(pci, revision);
+                                dxs_support = check_dxs_list(pci, pci->revision);
                         /* force to use VIA8233 or 8233A model according to
                          * dxs_support module option
                          */
@@ -2471,7 +2469,7 @@ static int __devinit snd_via82xx_probe(struct pci_dev *pci,
                 }
                 if (chip_type == TYPE_VIA8233A)
                         strcpy(card->driver, "VIA8233A");
-                else if (revision >= VIA_REV_8237)
+                else if (pci->revision >= VIA_REV_8237)
                         strcpy(card->driver, "VIA8237"); /* no slog assignment */
                 else
                         strcpy(card->driver, "VIA8233");
@@ -2482,7 +2480,7 @@ static int __devinit snd_via82xx_probe(struct pci_dev *pci,
                 goto __error;
         }
                 
-        if ((err = snd_via82xx_create(card, pci, chip_type, revision,
+        if ((err = snd_via82xx_create(card, pci, chip_type, pci->revision,
                                       ac97_clock, &chip)) < 0)
                 goto __error;
         card->private_data = chip;
diff --git a/sound/pci/via82xx_modem.c b/sound/pci/via82xx_modem.c
index b338e15db0d9..8cbf8eba4ae9 100644
--- a/sound/pci/via82xx_modem.c
+++ b/sound/pci/via82xx_modem.c
@@ -1162,7 +1162,6 @@ static int __devinit snd_via82xx_probe(struct pci_dev *pci,
 {
         struct snd_card *card;
         struct via82xx_modem *chip;
-        unsigned char revision;
         int chip_type = 0, card_type;
         unsigned int i;
         int err;
@@ -1172,7 +1171,6 @@ static int __devinit snd_via82xx_probe(struct pci_dev *pci,
                 return -ENOMEM;
 
         card_type = pci_id->driver_data;
-        pci_read_config_byte(pci, PCI_REVISION_ID, &revision);
         switch (card_type) {
         case TYPE_CARD_VIA82XX_MODEM:
                 strcpy(card->driver, "VIA82XX-MODEM");
@@ -1184,7 +1182,7 @@ static int __devinit snd_via82xx_probe(struct pci_dev *pci,
                 goto __error;
         }
                 
-        if ((err = snd_via82xx_create(card, pci, chip_type, revision,
+        if ((err = snd_via82xx_create(card, pci, chip_type, pci->revision,
                                       ac97_clock, &chip)) < 0)
                 goto __error;
         card->private_data = chip;
diff --git a/sound/pci/ymfpci/ymfpci_main.c b/sound/pci/ymfpci/ymfpci_main.c
index ea861bceaddf..ab7a81c35705 100644
--- a/sound/pci/ymfpci/ymfpci_main.c
+++ b/sound/pci/ymfpci/ymfpci_main.c
@@ -2404,7 +2404,7 @@ int __devinit snd_ymfpci_create(struct snd_card *card,
         chip->pci = pci;
         chip->irq = -1;
         chip->device_id = pci->device;
-        pci_read_config_byte(pci, PCI_REVISION_ID, &chip->rev);
+        chip->rev = pci->revision;
         chip->reg_area_phys = pci_resource_start(pci, 0);
         chip->reg_area_virt = ioremap_nocache(chip->reg_area_phys, 0x8000);
         pci_set_master(pci);