1 files changed, 5 insertions, 19 deletions

diff --git a/drivers/scsi/qla2xxx/qla_init.c b/drivers/scsi/qla2xxx/qla_init.c
index f2216ed2ad8c..d60e2c1ac442 100644
--- a/drivers/scsi/qla2xxx/qla_init.c
+++ b/drivers/scsi/qla2xxx/qla_init.c
@@ -564,12 +564,7 @@ qla2x00_initialize_adapter(scsi_qla_host_t *vha)
         if (ha->flags.disable_serdes) {
                 /* Mask HBA via NVRAM settings? */
                 ql_log(ql_log_info, vha, 0x0077,
-                    "Masking HBA WWPN "
-                    "%02x%02x%02x%02x%02x%02x%02x%02x (via NVRAM).\n",
-                    vha->port_name[0], vha->port_name[1],
-                    vha->port_name[2], vha->port_name[3],
-                    vha->port_name[4], vha->port_name[5],
-                    vha->port_name[6], vha->port_name[7]);
+                    "Masking HBA WWPN %8phN (via NVRAM).\n", vha->port_name);
                 return QLA_FUNCTION_FAILED;
         }
 
@@ -3061,22 +3056,13 @@ qla2x00_iidma_fcport(scsi_qla_host_t *vha, fc_port_t *fcport)
             mb);
         if (rval != QLA_SUCCESS) {
                 ql_dbg(ql_dbg_disc, vha, 0x2004,
-                    "Unable to adjust iIDMA "
-                    "%02x%02x%02x%02x%02x%02x%02x%02x -- %04x %x %04x "
-                    "%04x.\n", fcport->port_name[0], fcport->port_name[1],
-                    fcport->port_name[2], fcport->port_name[3],
-                    fcport->port_name[4], fcport->port_name[5],
-                    fcport->port_name[6], fcport->port_name[7], rval,
-                    fcport->fp_speed, mb[0], mb[1]);
+                    "Unable to adjust iIDMA %8phN -- %04x %x %04x %04x.\n",
+                    fcport->port_name, rval, fcport->fp_speed, mb[0], mb[1]);
         } else {
                 ql_dbg(ql_dbg_disc, vha, 0x2005,
-                    "iIDMA adjusted to %s GB/s "
-                    "on %02x%02x%02x%02x%02x%02x%02x%02x.\n",
+                    "iIDMA adjusted to %s GB/s on %8phN.\n",
                     qla2x00_get_link_speed_str(ha, fcport->fp_speed),
-                    fcport->port_name[0], fcport->port_name[1],
-                    fcport->port_name[2], fcport->port_name[3],
-                    fcport->port_name[4], fcport->port_name[5],
-                    fcport->port_name[6], fcport->port_name[7]);
+                    fcport->port_name);
         }
 }