diff options
| author | Sergei Shtylyov <sshtylyov@ru.mvista.com> | 2012-03-14 22:04:30 +0300 | 
|---|---|---|
| committer | James Bottomley <JBottomley@Parallels.com> | 2012-03-28 14:36:37 +0100 | 
| commit | 7d7311c44567cd2001ca318e4de64b753d9d35f8 (patch) | |
| tree | 060e090a47d6271a95fd800a44600af925e26757 /drivers/scsi/mpt2sas/mpt2sas_base.c | |
| parent | 2280512342ead9a2858b1490b21e5bcaf4f4cfc7 (diff) | |
| download | olio-linux-3.10-7d7311c44567cd2001ca318e4de64b753d9d35f8.tar.xz olio-linux-3.10-7d7311c44567cd2001ca318e4de64b753d9d35f8.zip  | |
[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/mpt2sas_base.c')
| -rw-r--r-- | drivers/scsi/mpt2sas/mpt2sas_base.c | 4 | 
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/scsi/mpt2sas/mpt2sas_base.c b/drivers/scsi/mpt2sas/mpt2sas_base.c index 921c818a922..c42372c6f24 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)  {  	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,  |