Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target...

[linux-2.6-microblaze.git] / drivers / scsi / qla2xxx / qla_init.c

diff --git a/drivers/scsi/qla2xxx/qla_init.c b/drivers/scsi/qla2xxx/qla_init.c
index ac579fc..32fb900 100644 (file)
--- a/drivers/scsi/qla2xxx/qla_init.c
+++ b/drivers/scsi/qla2xxx/qla_init.c
@@ -6465,7 +6465,7 @@ qla2x00_load_risc(scsi_qla_host_t *vha, uint32_t *srisc_addr)
        /* Validate firmware image by checking version. */
        if (blob->fw->size < 8 * sizeof(uint16_t)) {
                ql_log(ql_log_fatal, vha, 0x0085,
-                   "Unable to verify integrity of firmware image (%Zd).\n",
+                   "Unable to verify integrity of firmware image (%zd).\n",
                    blob->fw->size);
                goto fail_fw_integrity;
        }
@@ -6493,7 +6493,7 @@ qla2x00_load_risc(scsi_qla_host_t *vha, uint32_t *srisc_addr)
                if (blob->fw->size < fwclen) {
                        ql_log(ql_log_fatal, vha, 0x0088,
                            "Unable to verify integrity of firmware image "
-                           "(%Zd).\n", blob->fw->size);
+                           "(%zd).\n", blob->fw->size);
                        goto fail_fw_integrity;
                }
 
@@ -6574,7 +6574,7 @@ qla24xx_load_risc_blob(scsi_qla_host_t *vha, uint32_t *srisc_addr)
        /* Validate firmware image by checking version. */
        if (blob->fw->size < 8 * sizeof(uint32_t)) {
                ql_log(ql_log_fatal, vha, 0x0093,
-                   "Unable to verify integrity of firmware image (%Zd).\n",
+                   "Unable to verify integrity of firmware image (%zd).\n",
                    blob->fw->size);
                return QLA_FUNCTION_FAILED;
        }
@@ -6585,7 +6585,7 @@ qla24xx_load_risc_blob(scsi_qla_host_t *vha, uint32_t *srisc_addr)
            (dcode[0] == 0 && dcode[1] == 0 && dcode[2] == 0 &&
                dcode[3] == 0)) {
                ql_log(ql_log_fatal, vha, 0x0094,
-                   "Unable to verify integrity of firmware image (%Zd).\n",
+                   "Unable to verify integrity of firmware image (%zd).\n",
                    blob->fw->size);
                ql_log(ql_log_fatal, vha, 0x0095,
                    "Firmware data: %08x %08x %08x %08x.\n",
@@ -6603,7 +6603,7 @@ qla24xx_load_risc_blob(scsi_qla_host_t *vha, uint32_t *srisc_addr)
                if (blob->fw->size < fwclen) {
                        ql_log(ql_log_fatal, vha, 0x0096,
                            "Unable to verify integrity of firmware image "
-                           "(%Zd).\n", blob->fw->size);
+                           "(%zd).\n", blob->fw->size);
                        return QLA_FUNCTION_FAILED;
                }