diff options
Diffstat (limited to 'drivers/scsi/ips.c')
-rw-r--r-- | drivers/scsi/ips.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/drivers/scsi/ips.c b/drivers/scsi/ips.c index f9fce70f396a..9f8ed6b81576 100644 --- a/drivers/scsi/ips.c +++ b/drivers/scsi/ips.c | |||
@@ -6987,7 +6987,6 @@ ips_init_phase1(struct pci_dev *pci_dev, int *indexPtr) | |||
6987 | uint32_t mem_addr; | 6987 | uint32_t mem_addr; |
6988 | uint32_t io_len; | 6988 | uint32_t io_len; |
6989 | uint32_t mem_len; | 6989 | uint32_t mem_len; |
6990 | uint8_t revision_id; | ||
6991 | uint8_t bus; | 6990 | uint8_t bus; |
6992 | uint8_t func; | 6991 | uint8_t func; |
6993 | uint8_t irq; | 6992 | uint8_t irq; |
@@ -7066,12 +7065,6 @@ ips_init_phase1(struct pci_dev *pci_dev, int *indexPtr) | |||
7066 | } | 7065 | } |
7067 | } | 7066 | } |
7068 | 7067 | ||
7069 | /* get the revision ID */ | ||
7070 | if (pci_read_config_byte(pci_dev, PCI_REVISION_ID, &revision_id)) { | ||
7071 | IPS_PRINTK(KERN_WARNING, pci_dev, "Can't get revision id.\n"); | ||
7072 | return -1; | ||
7073 | } | ||
7074 | |||
7075 | subdevice_id = pci_dev->subsystem_device; | 7068 | subdevice_id = pci_dev->subsystem_device; |
7076 | 7069 | ||
7077 | /* found a controller */ | 7070 | /* found a controller */ |
@@ -7097,7 +7090,7 @@ ips_init_phase1(struct pci_dev *pci_dev, int *indexPtr) | |||
7097 | ha->mem_ptr = mem_ptr; | 7090 | ha->mem_ptr = mem_ptr; |
7098 | ha->ioremap_ptr = ioremap_ptr; | 7091 | ha->ioremap_ptr = ioremap_ptr; |
7099 | ha->host_num = (uint32_t) index; | 7092 | ha->host_num = (uint32_t) index; |
7100 | ha->revision_id = revision_id; | 7093 | ha->revision_id = pci_dev->revision; |
7101 | ha->slot_num = PCI_SLOT(pci_dev->devfn); | 7094 | ha->slot_num = PCI_SLOT(pci_dev->devfn); |
7102 | ha->device_id = pci_dev->device; | 7095 | ha->device_id = pci_dev->device; |
7103 | ha->subdevice_id = subdevice_id; | 7096 | ha->subdevice_id = subdevice_id; |