diff options
author | Andrew Vasquez <andrew.vasquez@qlogic.com> | 2009-04-07 01:33:39 -0400 |
---|---|---|
committer | James Bottomley <James.Bottomley@HansenPartnership.com> | 2009-05-20 18:21:07 -0400 |
commit | 7640335ea5b1a2da0d64303e6003012c619ae01a (patch) | |
tree | 4af5b169bb977fa04dea83a8588de3f6bf3516bd /drivers/scsi/qla2xxx/qla_sup.c | |
parent | bad7001c200458c24864df6f2b1b66548bca7c75 (diff) |
[SCSI] qla2xxx: Correct compilation failures when DEBUG'n' options are enabled.
Signed-off-by: Andrew Vasquez <andrew.vasquez@qlogic.com>
Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>
Diffstat (limited to 'drivers/scsi/qla2xxx/qla_sup.c')
-rw-r--r-- | drivers/scsi/qla2xxx/qla_sup.c | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/drivers/scsi/qla2xxx/qla_sup.c b/drivers/scsi/qla2xxx/qla_sup.c index 152ecfc26cd2..81187a0246cd 100644 --- a/drivers/scsi/qla2xxx/qla_sup.c +++ b/drivers/scsi/qla2xxx/qla_sup.c | |||
@@ -219,8 +219,8 @@ qla2x00_write_nvram_word(struct qla_hw_data *ha, uint32_t addr, uint16_t data) | |||
219 | wait_cnt = NVR_WAIT_CNT; | 219 | wait_cnt = NVR_WAIT_CNT; |
220 | do { | 220 | do { |
221 | if (!--wait_cnt) { | 221 | if (!--wait_cnt) { |
222 | DEBUG9_10(printk("%s(%ld): NVRAM didn't go ready...\n", | 222 | DEBUG9_10(qla_printk(KERN_WARNING, ha, |
223 | __func__, vha->host_no)); | 223 | "NVRAM didn't go ready...\n")); |
224 | break; | 224 | break; |
225 | } | 225 | } |
226 | NVRAM_DELAY(); | 226 | NVRAM_DELAY(); |
@@ -349,7 +349,7 @@ qla2x00_clear_nvram_protection(struct qla_hw_data *ha) | |||
349 | wait_cnt = NVR_WAIT_CNT; | 349 | wait_cnt = NVR_WAIT_CNT; |
350 | do { | 350 | do { |
351 | if (!--wait_cnt) { | 351 | if (!--wait_cnt) { |
352 | DEBUG9_10(qla_printk( | 352 | DEBUG9_10(qla_printk(KERN_WARNING, ha, |
353 | "NVRAM didn't go ready...\n")); | 353 | "NVRAM didn't go ready...\n")); |
354 | break; | 354 | break; |
355 | } | 355 | } |
@@ -408,7 +408,8 @@ qla2x00_set_nvram_protection(struct qla_hw_data *ha, int stat) | |||
408 | wait_cnt = NVR_WAIT_CNT; | 408 | wait_cnt = NVR_WAIT_CNT; |
409 | do { | 409 | do { |
410 | if (!--wait_cnt) { | 410 | if (!--wait_cnt) { |
411 | DEBUG9_10(qla_printk("NVRAM didn't go ready...\n")); | 411 | DEBUG9_10(qla_printk(KERN_WARNING, ha, |
412 | "NVRAM didn't go ready...\n")); | ||
412 | break; | 413 | break; |
413 | } | 414 | } |
414 | NVRAM_DELAY(); | 415 | NVRAM_DELAY(); |
@@ -1079,8 +1080,9 @@ qla24xx_write_flash_data(scsi_qla_host_t *vha, uint32_t *dwptr, uint32_t faddr, | |||
1079 | 0xff0000) | ((fdata >> 16) & 0xff)); | 1080 | 0xff0000) | ((fdata >> 16) & 0xff)); |
1080 | ret = qla24xx_erase_sector(vha, fdata); | 1081 | ret = qla24xx_erase_sector(vha, fdata); |
1081 | if (ret != QLA_SUCCESS) { | 1082 | if (ret != QLA_SUCCESS) { |
1082 | DEBUG9(qla_printk("Unable to erase sector: " | 1083 | DEBUG9(qla_printk(KERN_WARNING, ha, |
1083 | "address=%x.\n", faddr)); | 1084 | "Unable to erase sector: address=%x.\n", |
1085 | faddr)); | ||
1084 | break; | 1086 | break; |
1085 | } | 1087 | } |
1086 | } | 1088 | } |
@@ -1240,8 +1242,9 @@ qla24xx_write_nvram_data(scsi_qla_host_t *vha, uint8_t *buf, uint32_t naddr, | |||
1240 | ret = qla24xx_write_flash_dword(ha, | 1242 | ret = qla24xx_write_flash_dword(ha, |
1241 | nvram_data_addr(ha, naddr), cpu_to_le32(*dwptr)); | 1243 | nvram_data_addr(ha, naddr), cpu_to_le32(*dwptr)); |
1242 | if (ret != QLA_SUCCESS) { | 1244 | if (ret != QLA_SUCCESS) { |
1243 | DEBUG9(qla_printk("Unable to program nvram address=%x " | 1245 | DEBUG9(qla_printk(KERN_WARNING, ha, |
1244 | "data=%x.\n", naddr, *dwptr)); | 1246 | "Unable to program nvram address=%x data=%x.\n", |
1247 | naddr, *dwptr)); | ||
1245 | break; | 1248 | break; |
1246 | } | 1249 | } |
1247 | } | 1250 | } |