1 files changed, 18 insertions, 20 deletions

diff --git a/drivers/scsi/qla2xxx/qla_isr.c b/drivers/scsi/qla2xxx/qla_isr.c
index 9d1c7b56090a..873c82014b16 100644
--- a/drivers/scsi/qla2xxx/qla_isr.c
+++ b/drivers/scsi/qla2xxx/qla_isr.c
@@ -316,28 +316,24 @@ qla81xx_idc_event(scsi_qla_host_t *vha, uint16_t aen, uint16_t descr)
 }
 
 #define LS_UNKNOWN      2
-char *
-qla2x00_get_link_speed_str(struct qla_hw_data *ha)
+const char *
+qla2x00_get_link_speed_str(struct qla_hw_data *ha, uint16_t speed)
 {
-        static char *link_speeds[] = {"1", "2", "?", "4", "8", "16", "10"};
-        char *link_speed;
-        int fw_speed = ha->link_data_rate;
+        static const char * const link_speeds[] = {
+                "1", "2", "?", "4", "8", "16", "10"
+        };
 
         if (IS_QLA2100(ha) || IS_QLA2200(ha))
-                link_speed = link_speeds[0];
-        else if (fw_speed == 0x13)
-                link_speed = link_speeds[6];
-        else {
-                link_speed = link_speeds[LS_UNKNOWN];
-                if (fw_speed < 6)
-                        link_speed =
-                            link_speeds[fw_speed];
-        }
-
-        return link_speed;
+                return link_speeds[0];
+        else if (speed == 0x13)
+                return link_speeds[6];
+        else if (speed < 6)
+                return link_speeds[speed];
+        else
+                return link_speeds[LS_UNKNOWN];
 }
 
-void
+static void
 qla83xx_handle_8200_aen(scsi_qla_host_t *vha, uint16_t *mb)
 {
         struct qla_hw_data *ha = vha->hw;
@@ -671,7 +667,7 @@ skip_rio:
 
                 ql_dbg(ql_dbg_async, vha, 0x500a,
                     "LOOP UP detected (%s Gbps).\n",
-                    qla2x00_get_link_speed_str(ha));
+                    qla2x00_get_link_speed_str(ha, ha->link_data_rate));
 
                 vha->flags.management_server_logged_in = 0;
                 qla2x00_post_aen_work(vha, FCH_EVT_LINKUP, ha->link_data_rate);
@@ -860,7 +856,7 @@ skip_rio:
                     mb[1], mb[2], mb[3]);
                 ql_log(ql_log_warn, vha, 0x505f,
                     "Link is operational (%s Gbps).\n",
-                    qla2x00_get_link_speed_str(ha));
+                    qla2x00_get_link_speed_str(ha, ha->link_data_rate));
 
                 /*
                  * Mark all devices as missing so we will login again.
@@ -2944,7 +2940,9 @@ skip_msi:
                     "Failed to reserve interrupt %d already in use.\n",
                     ha->pdev->irq);
                 goto fail;
-        }
+        } else if (!ha->flags.msi_enabled)
+                ql_dbg(ql_dbg_init, vha, 0x0125,
+                    "INTa mode: Enabled.\n");
 
 clear_risc_ints: