Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/pci-2.6

* master.kernel.org:/pub/scm/linux/kernel/git/gregkh/pci-2.6: (34 commits)
  PCI: Only build PCI syscalls on architectures that want them
  PCI: limit pci_get_bus_and_slot to domain 0
  PCI: hotplug: acpiphp: avoid acpiphp "cannot get bridge info" PCI hotplug failure
  PCI: hotplug: acpiphp: remove hot plug parameter write to PCI host bridge
  PCI: hotplug: acpiphp: fix slot poweroff problem on systems without _PS3
  PCI: hotplug: pciehp: wait for 1 second after power off slot
  PCI: pci_set_power_state(): check for PM capabilities earlier
  PCI: cpci_hotplug: Convert to use the kthread API
  PCI: add pci_try_set_mwi
  PCI: pcie: remove SPIN_LOCK_UNLOCKED
  PCI: ROUND_UP macro cleanup in drivers/pci
  PCI: remove pci_dac_dma_... APIs
  PCI: pci-x-pci-express-read-control-interfaces cleanups
  PCI: Fix typo in include/linux/pci.h
  PCI: pci_ids, remove double or more empty lines
  PCI: pci_ids, add atheros and 3com_2 vendors
  PCI: pci_ids, reorder some entries
  PCI: i386: traps, change VENDOR to DEVICE
  PCI: ATM: lanai, change VENDOR to DEVICE
  PCI: Change all drivers to use pci_device->revision
  ...

1 files changed, 6 insertions, 8 deletions

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;