diff options
author | Sergei Shtylyov <sshtylyov@ru.mvista.com> | 2012-03-14 15:04:30 -0400 |
---|---|---|
committer | James Bottomley <JBottomley@Parallels.com> | 2012-03-28 09:36:37 -0400 |
commit | 7d7311c44567cd2001ca318e4de64b753d9d35f8 (patch) | |
tree | 060e090a47d6271a95fd800a44600af925e26757 /drivers/scsi/mpt2sas | |
parent | 2280512342ead9a2858b1490b21e5bcaf4f4cfc7 (diff) |
[SCSI] atp870u, mpt2sas, qla4xxx use pci_dev->revision
commit 44c10138fd4bbc4b6d6bff0873c24902f2a9da65 (PCI: Change all
drivers to use pci_device->revision) converted all drivers to use
pci_dev->revision. Convert these three drivers which got missed.
Signed-off-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: James Bottomley <JBottomley@Parallels.com>
Diffstat (limited to 'drivers/scsi/mpt2sas')
-rw-r--r-- | drivers/scsi/mpt2sas/mpt2sas_base.c | 4 | ||||
-rw-r--r-- | drivers/scsi/mpt2sas/mpt2sas_ctl.c | 4 |
2 files changed, 2 insertions, 6 deletions
diff --git a/drivers/scsi/mpt2sas/mpt2sas_base.c b/drivers/scsi/mpt2sas/mpt2sas_base.c index 921c818a9226..c42372c6f246 100644 --- a/drivers/scsi/mpt2sas/mpt2sas_base.c +++ b/drivers/scsi/mpt2sas/mpt2sas_base.c | |||
@@ -2060,12 +2060,10 @@ _base_display_ioc_capabilities(struct MPT2SAS_ADAPTER *ioc) | |||
2060 | { | 2060 | { |
2061 | int i = 0; | 2061 | int i = 0; |
2062 | char desc[16]; | 2062 | char desc[16]; |
2063 | u8 revision; | ||
2064 | u32 iounit_pg1_flags; | 2063 | u32 iounit_pg1_flags; |
2065 | u32 bios_version; | 2064 | u32 bios_version; |
2066 | 2065 | ||
2067 | bios_version = le32_to_cpu(ioc->bios_pg3.BiosVersion); | 2066 | bios_version = le32_to_cpu(ioc->bios_pg3.BiosVersion); |
2068 | pci_read_config_byte(ioc->pdev, PCI_CLASS_REVISION, &revision); | ||
2069 | strncpy(desc, ioc->manu_pg0.ChipName, 16); | 2067 | strncpy(desc, ioc->manu_pg0.ChipName, 16); |
2070 | printk(MPT2SAS_INFO_FMT "%s: FWVersion(%02d.%02d.%02d.%02d), " | 2068 | printk(MPT2SAS_INFO_FMT "%s: FWVersion(%02d.%02d.%02d.%02d), " |
2071 | "ChipRevision(0x%02x), BiosVersion(%02d.%02d.%02d.%02d)\n", | 2069 | "ChipRevision(0x%02x), BiosVersion(%02d.%02d.%02d.%02d)\n", |
@@ -2074,7 +2072,7 @@ _base_display_ioc_capabilities(struct MPT2SAS_ADAPTER *ioc) | |||
2074 | (ioc->facts.FWVersion.Word & 0x00FF0000) >> 16, | 2072 | (ioc->facts.FWVersion.Word & 0x00FF0000) >> 16, |
2075 | (ioc->facts.FWVersion.Word & 0x0000FF00) >> 8, | 2073 | (ioc->facts.FWVersion.Word & 0x0000FF00) >> 8, |
2076 | ioc->facts.FWVersion.Word & 0x000000FF, | 2074 | ioc->facts.FWVersion.Word & 0x000000FF, |
2077 | revision, | 2075 | ioc->pdev->revision, |
2078 | (bios_version & 0xFF000000) >> 24, | 2076 | (bios_version & 0xFF000000) >> 24, |
2079 | (bios_version & 0x00FF0000) >> 16, | 2077 | (bios_version & 0x00FF0000) >> 16, |
2080 | (bios_version & 0x0000FF00) >> 8, | 2078 | (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) | |||
1026 | { | 1026 | { |
1027 | struct mpt2_ioctl_iocinfo karg; | 1027 | struct mpt2_ioctl_iocinfo karg; |
1028 | struct MPT2SAS_ADAPTER *ioc; | 1028 | struct MPT2SAS_ADAPTER *ioc; |
1029 | u8 revision; | ||
1030 | 1029 | ||
1031 | if (copy_from_user(&karg, arg, sizeof(karg))) { | 1030 | if (copy_from_user(&karg, arg, sizeof(karg))) { |
1032 | printk(KERN_ERR "failure at %s:%d/%s()!\n", | 1031 | printk(KERN_ERR "failure at %s:%d/%s()!\n", |
@@ -1046,8 +1045,7 @@ _ctl_getiocinfo(void __user *arg) | |||
1046 | karg.adapter_type = MPT2_IOCTL_INTERFACE_SAS2; | 1045 | karg.adapter_type = MPT2_IOCTL_INTERFACE_SAS2; |
1047 | if (ioc->pfacts) | 1046 | if (ioc->pfacts) |
1048 | karg.port_number = ioc->pfacts[0].PortNumber; | 1047 | karg.port_number = ioc->pfacts[0].PortNumber; |
1049 | pci_read_config_byte(ioc->pdev, PCI_CLASS_REVISION, &revision); | 1048 | karg.hw_rev = ioc->pdev->revision; |
1050 | karg.hw_rev = revision; | ||
1051 | karg.pci_id = ioc->pdev->device; | 1049 | karg.pci_id = ioc->pdev->device; |
1052 | karg.subsystem_device = ioc->pdev->subsystem_device; | 1050 | karg.subsystem_device = ioc->pdev->subsystem_device; |
1053 | karg.subsystem_vendor = ioc->pdev->subsystem_vendor; | 1051 | karg.subsystem_vendor = ioc->pdev->subsystem_vendor; |