[SCSI] qla2xxx: Generalize FW-Interface-2 support.

In preparation for new ISP types.

Signed-off-by: Andrew Vasquez <andrew.vasquez@qlogic.com>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>

1 files changed, 6 insertions, 2 deletions

diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c
index b5a77b0c0deb..e246f944957d 100644
--- a/drivers/scsi/qla2xxx/qla_os.c
+++ b/drivers/scsi/qla2xxx/qla_os.c
@@ -1238,19 +1238,23 @@ qla2x00_set_isp_flags(scsi_qla_host_t *ha)
         case PCI_DEVICE_ID_QLOGIC_ISP2422:
                 ha->device_type |= DT_ISP2422;
                 ha->device_type |= DT_ZIO_SUPPORTED;
+                ha->device_type |= DT_FWI2;
                 ha->fw_srisc_address = RISC_START_ADDRESS_2400;
                 break;
         case PCI_DEVICE_ID_QLOGIC_ISP2432:
                 ha->device_type |= DT_ISP2432;
                 ha->device_type |= DT_ZIO_SUPPORTED;
+                ha->device_type |= DT_FWI2;
                 ha->fw_srisc_address = RISC_START_ADDRESS_2400;
                 break;
         case PCI_DEVICE_ID_QLOGIC_ISP5422:
                 ha->device_type |= DT_ISP5422;
+                ha->device_type |= DT_FWI2;
                 ha->fw_srisc_address = RISC_START_ADDRESS_2400;
                 break;
         case PCI_DEVICE_ID_QLOGIC_ISP5432:
                 ha->device_type |= DT_ISP5432;
+                ha->device_type |= DT_FWI2;
                 ha->fw_srisc_address = RISC_START_ADDRESS_2400;
                 break;
         }
@@ -1632,7 +1636,7 @@ qla2x00_probe_one(struct pci_dev *pdev, const struct pci_device_id *id)
 
         spin_lock_irqsave(&ha->hardware_lock, flags);
         reg = ha->iobase;
-        if (IS_QLA24XX(ha) || IS_QLA54XX(ha)) {
+        if (IS_FWI2_CAPABLE(ha)) {
                 WRT_REG_DWORD(&reg->isp24.hccr, HCCRX_CLR_HOST_INT);
                 WRT_REG_DWORD(&reg->isp24.hccr, HCCRX_CLR_RISC_INT);
         } else {
@@ -2025,7 +2029,7 @@ qla2x00_mem_alloc(scsi_qla_host_t *ha)
                         }
                         memset(ha->ct_sns, 0, sizeof(struct ct_sns_pkt));
 
-                        if (IS_QLA24XX(ha) || IS_QLA54XX(ha)) {
+                        if (IS_FWI2_CAPABLE(ha)) {
                                 /*
                                  * Get consistent memory allocated for SFP
                                  * block.