2 files changed, 3 insertions, 7 deletions

diff --git a/drivers/scsi/mpt2sas/mpt2sas_base.c b/drivers/scsi/mpt2sas/mpt2sas_base.c
index 5e69f468535f..8a59a772fdf2 100644
--- a/drivers/scsi/mpt2sas/mpt2sas_base.c
+++ b/drivers/scsi/mpt2sas/mpt2sas_base.c
@@ -657,7 +657,7 @@ _base_sas_log_info(struct MPT2SAS_ADAPTER *ioc , u32 log_info)
                 return;
 
         /* eat the loginfos associated with task aborts */
-        if (ioc->ignore_loginfos && (log_info == 30050000 || log_info ==
+        if (ioc->ignore_loginfos && (log_info == 0x30050000 || log_info ==
             0x31140000 || log_info == 0x31130000))
                 return;
 
@@ -2060,12 +2060,10 @@ _base_display_ioc_capabilities(struct MPT2SAS_ADAPTER *ioc)
 {
         int i = 0;
         char desc[16];
-        u8 revision;
         u32 iounit_pg1_flags;
         u32 bios_version;
 
         bios_version = le32_to_cpu(ioc->bios_pg3.BiosVersion);
-        pci_read_config_byte(ioc->pdev, PCI_CLASS_REVISION, &revision);
         strncpy(desc, ioc->manu_pg0.ChipName, 16);
         printk(MPT2SAS_INFO_FMT "%s: FWVersion(%02d.%02d.%02d.%02d), "
            "ChipRevision(0x%02x), BiosVersion(%02d.%02d.%02d.%02d)\n",
@@ -2074,7 +2072,7 @@ _base_display_ioc_capabilities(struct MPT2SAS_ADAPTER *ioc)
            (ioc->facts.FWVersion.Word & 0x00FF0000) >> 16,
            (ioc->facts.FWVersion.Word & 0x0000FF00) >> 8,
            ioc->facts.FWVersion.Word & 0x000000FF,
-           revision,
+           ioc->pdev->revision,
            (bios_version & 0xFF000000) >> 24,
            (bios_version & 0x00FF0000) >> 16,
            (bios_version & 0x0000FF00) >> 8,
diff --git a/drivers/scsi/mpt2sas/mpt2sas_ctl.c b/drivers/scsi/mpt2sas/mpt2sas_ctl.c
index 7fceb899029e..3b9a28efea82 100644
--- a/drivers/scsi/mpt2sas/mpt2sas_ctl.c
+++ b/drivers/scsi/mpt2sas/mpt2sas_ctl.c
@@ -1026,7 +1026,6 @@ _ctl_getiocinfo(void __user *arg)
 {
         struct mpt2_ioctl_iocinfo karg;
         struct MPT2SAS_ADAPTER *ioc;
-        u8 revision;
 
         if (copy_from_user(&karg, arg, sizeof(karg))) {
                 printk(KERN_ERR "failure at %s:%d/%s()!\n",
@@ -1046,8 +1045,7 @@ _ctl_getiocinfo(void __user *arg)
                 karg.adapter_type = MPT2_IOCTL_INTERFACE_SAS2;
         if (ioc->pfacts)
                 karg.port_number = ioc->pfacts[0].PortNumber;
-        pci_read_config_byte(ioc->pdev, PCI_CLASS_REVISION, &revision);
-        karg.hw_rev = revision;
+        karg.hw_rev = ioc->pdev->revision;
         karg.pci_id = ioc->pdev->device;
         karg.subsystem_device = ioc->pdev->subsystem_device;
         karg.subsystem_vendor = ioc->pdev->subsystem_vendor;