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, 2 insertions, 6 deletions

diff --git a/drivers/ata/pata_sis.c b/drivers/ata/pata_sis.c
index 657b1ee2f5c1..9a829a7cbc60 100644
--- a/drivers/ata/pata_sis.c
+++ b/drivers/ata/pata_sis.c
@@ -931,9 +931,7 @@ static int sis_init_one (struct pci_dev *pdev, const struct pci_device_id *ent)
                 if (host != NULL) {
                         chipset = sets;                 /* Match found */
                         if (sets->device == 0x630) {    /* SIS630 */
-                                u8 host_rev;
-                                pci_read_config_byte(host, PCI_REVISION_ID, &host_rev);
-                                if (host_rev >= 0x30)   /* 630 ET */
+                                if (host->revision >= 0x30)     /* 630 ET */
                                         chipset = &sis100_early;
                         }
                         break;
@@ -977,7 +975,6 @@ static int sis_init_one (struct pci_dev *pdev, const struct pci_device_id *ent)
                 u16 trueid;
                 u8 prefctl;
                 u8 idecfg;
-                u8 sbrev;
 
                 /* Try the second unmasking technique */
                 pci_read_config_byte(pdev, 0x4a, &idecfg);
@@ -990,11 +987,10 @@ static int sis_init_one (struct pci_dev *pdev, const struct pci_device_id *ent)
                         lpc_bridge = pci_get_slot(pdev->bus, 0x10); /* Bus 0 Dev 2 Fn 0 */
                         if (lpc_bridge == NULL)
                                 break;
-                        pci_read_config_byte(lpc_bridge, PCI_REVISION_ID, &sbrev);
                         pci_read_config_byte(pdev, 0x49, &prefctl);
                         pci_dev_put(lpc_bridge);
 
-                        if (sbrev == 0x10 && (prefctl & 0x80)) {
+                        if (lpc_bridge->revision == 0x10 && (prefctl & 0x80)) {
                                 chipset = &sis133_early;
                                 break;
                         }