[SCSI] qla2xxx: Corrections to log messages.

Signed-off-by: Saurav Kashyap <saurav.kashyap@qlogic.com>
Signed-off-by: Chad Dupuis <chad.dupuis@qlogic.com>
Signed-off-by: James Bottomley <JBottomley@Parallels.com>

2 files changed, 5 insertions, 6 deletions

diff --git a/drivers/scsi/qla2xxx/qla_nx.c b/drivers/scsi/qla2xxx/qla_nx.c
index 195528a708a7..f88eb833206a 100644
--- a/drivers/scsi/qla2xxx/qla_nx.c
+++ b/drivers/scsi/qla2xxx/qla_nx.c
@@ -1190,12 +1190,12 @@ qla82xx_pinit_from_rom(scsi_qla_host_t *vha)
         }
 
         /* Offset in flash = lower 16 bits
-         * Number of enteries = upper 16 bits
+         * Number of entries = upper 16 bits
          */
         offset = n & 0xffffU;
         n = (n >> 16) & 0xffffU;
 
-        /* number of addr/value pair should not exceed 1024 enteries */
+        /* number of addr/value pair should not exceed 1024 entries */
         if (n  >= 1024) {
                 ql_log(ql_log_fatal, vha, 0x0071,
                     "Card flash not initialized:n=0x%x.\n", n);
@@ -2446,7 +2446,7 @@ qla82xx_load_fw(scsi_qla_host_t *vha)
 
         if (qla82xx_fw_load_from_flash(ha) == QLA_SUCCESS) {
                 ql_log(ql_log_info, vha, 0x00a1,
-                    "Firmware loaded successully from flash.\n");
+                    "Firmware loaded successfully from flash.\n");
                 return QLA_SUCCESS;
         } else {
                 ql_log(ql_log_warn, vha, 0x0108,
@@ -2461,7 +2461,7 @@ try_blob_fw:
         blob = ha->hablob = qla2x00_request_firmware(vha);
         if (!blob) {
                 ql_log(ql_log_fatal, vha, 0x00a3,
-                    "Firmware image not preset.\n");
+                    "Firmware image not present.\n");
                 goto fw_load_failed;
         }
 
@@ -2689,7 +2689,7 @@ qla82xx_write_flash_data(struct scsi_qla_host *vha, uint32_t *dwptr,
                 if (!optrom) {
                         ql_log(ql_log_warn, vha, 0xb01b,
                             "Unable to allocate memory "
-                            "for optron burst write (%x KB).\n",
+                            "for optrom burst write (%x KB).\n",
                             OPTROM_BURST_SIZE / 1024);
                 }
         }
diff --git a/drivers/scsi/qla2xxx/qla_nx.h b/drivers/scsi/qla2xxx/qla_nx.h
index 393319861bd6..6eb210e3cc63 100644
--- a/drivers/scsi/qla2xxx/qla_nx.h
+++ b/drivers/scsi/qla2xxx/qla_nx.h
@@ -562,7 +562,6 @@
 #define QLA82XX_FW_VERSION_SUB          (QLA82XX_CAM_RAM(0x158))
 #define QLA82XX_PCIE_REG(reg)           (QLA82XX_CRB_PCIE + (reg))
 
-#define PCIE_CHICKEN3                   (0x120c8)
 #define PCIE_SETUP_FUNCTION             (0x12040)
 #define PCIE_SETUP_FUNCTION2            (0x12048)