4 files changed, 9 insertions, 33 deletions

diff --git a/drivers/scsi/aic94xx/aic94xx_init.c b/drivers/scsi/aic94xx/aic94xx_init.c
index 27852b43b904..1c0d7578e791 100644
--- a/drivers/scsi/aic94xx/aic94xx_init.c
+++ b/drivers/scsi/aic94xx/aic94xx_init.c
@@ -223,13 +223,8 @@ static int __devinit asd_common_setup(struct asd_ha_struct *asd_ha)
 {
         int err, i;
 
-        err = pci_read_config_byte(asd_ha->pcidev, PCI_REVISION_ID,
-                                   &asd_ha->revision_id);
-        if (err) {
-                asd_printk("couldn't read REVISION ID register of %s\n",
-                           pci_name(asd_ha->pcidev));
-                goto Err;
-        }
+        asd_ha->revision_id = asd_ha->pcidev->revision;
+
         err = -ENODEV;
         if (asd_ha->revision_id < AIC9410_DEV_REV_B0) {
                 asd_printk("%s is revision %s (%X), which is not supported\n",
diff --git a/drivers/scsi/ipr.c b/drivers/scsi/ipr.c
index fa6ff295e568..81330712048c 100644
--- a/drivers/scsi/ipr.c
+++ b/drivers/scsi/ipr.c
@@ -5367,18 +5367,12 @@ static const u16 ipr_blocked_processors[] = {
  **/
 static int ipr_invalid_adapter(struct ipr_ioa_cfg *ioa_cfg)
 {
-        u8 rev_id;
         int i;
 
-        if (ioa_cfg->type == 0x5702) {
-                if (pci_read_config_byte(ioa_cfg->pdev, PCI_REVISION_ID,
-                                         &rev_id) == PCIBIOS_SUCCESSFUL) {
-                        if (rev_id < 4) {
-                                for (i = 0; i < ARRAY_SIZE(ipr_blocked_processors); i++){
-                                        if (__is_processor(ipr_blocked_processors[i]))
-                                                return 1;
-                                }
-                        }
+        if ((ioa_cfg->type == 0x5702) && (ioa_cfg->pdev->revision < 4)) {
+                for (i = 0; i < ARRAY_SIZE(ipr_blocked_processors); i++){
+                        if (__is_processor(ipr_blocked_processors[i]))
+                                return 1;
                 }
         }
         return 0;
@@ -7535,13 +7529,7 @@ static int __devinit ipr_probe_ioa(struct pci_dev *pdev,
         else
                 ioa_cfg->transop_timeout = IPR_OPERATIONAL_TIMEOUT;
 
-        rc = pci_read_config_byte(pdev, PCI_REVISION_ID, &ioa_cfg->revid);
-
-        if (rc != PCIBIOS_SUCCESSFUL) {
-                dev_err(&pdev->dev, "Failed to read PCI revision ID\n");
-                rc = -EIO;
-                goto out_scsi_host_put;
-        }
+        ioa_cfg->revid = pdev->revision;
 
         ipr_regs_pci = pci_resource_start(pdev, 0);
 
diff --git a/drivers/scsi/ips.c b/drivers/scsi/ips.c
index 8b704f73055a..40f148e0833f 100644
--- a/drivers/scsi/ips.c
+++ b/drivers/scsi/ips.c
@@ -7148,7 +7148,6 @@ ips_init_phase1(struct pci_dev *pci_dev, int *indexPtr)
         uint32_t mem_addr;
         uint32_t io_len;
         uint32_t mem_len;
-        uint8_t revision_id;
         uint8_t bus;
         uint8_t func;
         uint8_t irq;
@@ -7227,12 +7226,6 @@ ips_init_phase1(struct pci_dev *pci_dev, int *indexPtr)
                 }
         }
 
-        /* get the revision ID */
-        if (pci_read_config_byte(pci_dev, PCI_REVISION_ID, &revision_id)) {
-                IPS_PRINTK(KERN_WARNING, pci_dev, "Can't get revision id.\n");
-                return -1;
-        }
-
         subdevice_id = pci_dev->subsystem_device;
 
         /* found a controller */
@@ -7258,7 +7251,7 @@ ips_init_phase1(struct pci_dev *pci_dev, int *indexPtr)
         ha->mem_ptr = mem_ptr;
         ha->ioremap_ptr = ioremap_ptr;
         ha->host_num = (uint32_t) index;
-        ha->revision_id = revision_id;
+        ha->revision_id = pci_dev->revision;
         ha->slot_num = PCI_SLOT(pci_dev->devfn);
         ha->device_id = pci_dev->device;
         ha->subdevice_id = subdevice_id;
diff --git a/drivers/scsi/qla2xxx/qla_init.c b/drivers/scsi/qla2xxx/qla_init.c
index 2a45aec4ff29..cf94f8636ba5 100644
--- a/drivers/scsi/qla2xxx/qla_init.c
+++ b/drivers/scsi/qla2xxx/qla_init.c
@@ -296,7 +296,7 @@ qla24xx_pci_config(scsi_qla_host_t *ha)
         d &= ~PCI_ROM_ADDRESS_ENABLE;
         pci_write_config_dword(ha->pdev, PCI_ROM_ADDRESS, d);
 
-        pci_read_config_word(ha->pdev, PCI_REVISION_ID, &ha->chip_revision);
+        ha->chip_revision = ha->pdev->revision;
 
         /* Get PCI bus information. */
         spin_lock_irqsave(&ha->hardware_lock, flags);