[SCSI] qla2xxx: Add ISP54xx support.

Chip is similar in form to our ISP24xx offering.

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

1 files changed, 4 insertions, 6 deletions

diff --git a/drivers/scsi/qla2xxx/qla_gs.c b/drivers/scsi/qla2xxx/qla_gs.c
index d620a8e8a614..2ebf259fccb2 100644
--- a/drivers/scsi/qla2xxx/qla_gs.c
+++ b/drivers/scsi/qla2xxx/qla_gs.c
@@ -126,7 +126,7 @@ qla2x00_chk_ms_status(scsi_qla_host_t *ha, ms_iocb_entry_t *ms_pkt,
                 DEBUG2_3(printk("scsi(%ld): %s failed, error status (%x).\n",
                     ha->host_no, routine, ms_pkt->entry_status));
         } else {
-                if (IS_QLA24XX(ha) || IS_QLA25XX(ha))
+                if (IS_QLA24XX(ha) || IS_QLA54XX(ha))
                         comp_status =
                             ((struct ct_entry_24xx *)ms_pkt)->comp_status;
                 else
@@ -1200,7 +1200,7 @@ qla2x00_update_ms_fdmi_iocb(scsi_qla_host_t *ha, uint32_t req_size)
         ms_iocb_entry_t *ms_pkt = ha->ms_iocb;
         struct ct_entry_24xx *ct_pkt = (struct ct_entry_24xx *)ha->ms_iocb;
 
-        if (IS_QLA24XX(ha) || IS_QLA25XX(ha)) {
+        if (IS_QLA24XX(ha) || IS_QLA54XX(ha)) {
                 ct_pkt->cmd_byte_count = cpu_to_le32(req_size);
                 ct_pkt->dseg_0_len = ct_pkt->cmd_byte_count;
         } else {
@@ -1529,9 +1529,7 @@ qla2x00_fdmi_rpa(scsi_qla_host_t *ha)
         eiter = (struct ct_fdmi_port_attr *) (entries + size);
         eiter->type = __constant_cpu_to_be16(FDMI_PORT_SUPPORT_SPEED);
         eiter->len = __constant_cpu_to_be16(4 + 4);
-        if (IS_QLA25XX(ha))
-                eiter->a.sup_speed = __constant_cpu_to_be32(8);
-        else if (IS_QLA24XX(ha))
+        if (IS_QLA24XX(ha) || IS_QLA54XX(ha))
                 eiter->a.sup_speed = __constant_cpu_to_be32(4);
         else if (IS_QLA23XX(ha))
                 eiter->a.sup_speed = __constant_cpu_to_be32(2);
@@ -1566,7 +1564,7 @@ qla2x00_fdmi_rpa(scsi_qla_host_t *ha)
         eiter = (struct ct_fdmi_port_attr *) (entries + size);
         eiter->type = __constant_cpu_to_be16(FDMI_PORT_MAX_FRAME_SIZE);
         eiter->len = __constant_cpu_to_be16(4 + 4);
-        max_frame_size = IS_QLA24XX(ha) || IS_QLA25XX(ha) ?
+        max_frame_size = IS_QLA24XX(ha) || IS_QLA54XX(ha) ?
                 (uint32_t) icb24->frame_payload_size:
                 (uint32_t) ha->init_cb->frame_payload_size;
         eiter->a.max_frame_size = cpu_to_be32(max_frame_size);