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_init.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_init.c')
-rw-r--r-- | drivers/scsi/qla2xxx/qla_init.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/scsi/qla2xxx/qla_init.c b/drivers/scsi/qla2xxx/qla_init.c index bd7dd84c0648..9a343ec67567 100644 --- a/drivers/scsi/qla2xxx/qla_init.c +++ b/drivers/scsi/qla2xxx/qla_init.c | |||
@@ -634,7 +634,7 @@ qla2x00_chip_diag(scsi_qla_host_t *vha) | |||
634 | goto chip_diag_failed; | 634 | goto chip_diag_failed; |
635 | 635 | ||
636 | DEBUG3(printk("scsi(%ld): Reset register cleared by chip reset\n", | 636 | DEBUG3(printk("scsi(%ld): Reset register cleared by chip reset\n", |
637 | ha->host_no)); | 637 | vha->host_no)); |
638 | 638 | ||
639 | /* Reset RISC processor. */ | 639 | /* Reset RISC processor. */ |
640 | WRT_REG_WORD(®->hccr, HCCR_RESET_RISC); | 640 | WRT_REG_WORD(®->hccr, HCCR_RESET_RISC); |
@@ -655,7 +655,7 @@ qla2x00_chip_diag(scsi_qla_host_t *vha) | |||
655 | goto chip_diag_failed; | 655 | goto chip_diag_failed; |
656 | 656 | ||
657 | /* Check product ID of chip */ | 657 | /* Check product ID of chip */ |
658 | DEBUG3(printk("scsi(%ld): Checking product ID of chip\n", ha->host_no)); | 658 | DEBUG3(printk("scsi(%ld): Checking product ID of chip\n", vha->host_no)); |
659 | 659 | ||
660 | mb[1] = RD_MAILBOX_REG(ha, reg, 1); | 660 | mb[1] = RD_MAILBOX_REG(ha, reg, 1); |
661 | mb[2] = RD_MAILBOX_REG(ha, reg, 2); | 661 | mb[2] = RD_MAILBOX_REG(ha, reg, 2); |
@@ -2110,7 +2110,7 @@ qla2x00_configure_local_loop(scsi_qla_host_t *vha) | |||
2110 | goto cleanup_allocation; | 2110 | goto cleanup_allocation; |
2111 | 2111 | ||
2112 | DEBUG3(printk("scsi(%ld): Entries in ID list (%d)\n", | 2112 | DEBUG3(printk("scsi(%ld): Entries in ID list (%d)\n", |
2113 | ha->host_no, entries)); | 2113 | vha->host_no, entries)); |
2114 | DEBUG3(qla2x00_dump_buffer((uint8_t *)ha->gid_list, | 2114 | DEBUG3(qla2x00_dump_buffer((uint8_t *)ha->gid_list, |
2115 | entries * sizeof(struct gid_list_info))); | 2115 | entries * sizeof(struct gid_list_info))); |
2116 | 2116 | ||
@@ -3587,7 +3587,7 @@ qla24xx_nvram_config(scsi_qla_host_t *vha) | |||
3587 | for (cnt = 0, chksum = 0; cnt < ha->nvram_size >> 2; cnt++) | 3587 | for (cnt = 0, chksum = 0; cnt < ha->nvram_size >> 2; cnt++) |
3588 | chksum += le32_to_cpu(*dptr++); | 3588 | chksum += le32_to_cpu(*dptr++); |
3589 | 3589 | ||
3590 | DEBUG5(printk("scsi(%ld): Contents of NVRAM\n", ha->host_no)); | 3590 | DEBUG5(printk("scsi(%ld): Contents of NVRAM\n", vha->host_no)); |
3591 | DEBUG5(qla2x00_dump_buffer((uint8_t *)nv, ha->nvram_size)); | 3591 | DEBUG5(qla2x00_dump_buffer((uint8_t *)nv, ha->nvram_size)); |
3592 | 3592 | ||
3593 | /* Bad NVRAM data, set defaults parameters. */ | 3593 | /* Bad NVRAM data, set defaults parameters. */ |
@@ -4305,7 +4305,7 @@ qla81xx_nvram_config(scsi_qla_host_t *vha) | |||
4305 | for (cnt = 0, chksum = 0; cnt < ha->nvram_size >> 2; cnt++) | 4305 | for (cnt = 0, chksum = 0; cnt < ha->nvram_size >> 2; cnt++) |
4306 | chksum += le32_to_cpu(*dptr++); | 4306 | chksum += le32_to_cpu(*dptr++); |
4307 | 4307 | ||
4308 | DEBUG5(printk("scsi(%ld): Contents of NVRAM\n", ha->host_no)); | 4308 | DEBUG5(printk("scsi(%ld): Contents of NVRAM\n", vha->host_no)); |
4309 | DEBUG5(qla2x00_dump_buffer((uint8_t *)nv, ha->nvram_size)); | 4309 | DEBUG5(qla2x00_dump_buffer((uint8_t *)nv, ha->nvram_size)); |
4310 | 4310 | ||
4311 | /* Bad NVRAM data, set defaults parameters. */ | 4311 | /* Bad NVRAM data, set defaults parameters. */ |