Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7640335e authored by Andrew Vasquez's avatar Andrew Vasquez Committed by James Bottomley
Browse files

[SCSI] qla2xxx: Correct compilation failures when DEBUG'n' options are enabled. 



Signed-off-by: default avatarAndrew Vasquez <andrew.vasquez@qlogic.com>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@HansenPartnership.com>
parent bad7001c

drivers/scsi/qla2xxx/qla_init.c

+5 −5
Original line number Diff line number Diff line
@@ -634,7 +634,7 @@ qla2x00_chip_diag(scsi_qla_host_t *vha) 
		goto chip_diag_failed;



	DEBUG3(printk("scsi(%ld): Reset register cleared by chip reset\n",

	    ha->host_no));

	    vha->host_no));



	/* Reset RISC processor. */

	WRT_REG_WORD(&reg->hccr, HCCR_RESET_RISC);
@@ -655,7 +655,7 @@ qla2x00_chip_diag(scsi_qla_host_t *vha) 
		goto chip_diag_failed;



	/* Check product ID of chip */

	DEBUG3(printk("scsi(%ld): Checking product ID of chip\n", ha->host_no));

	DEBUG3(printk("scsi(%ld): Checking product ID of chip\n", vha->host_no));



	mb[1] = RD_MAILBOX_REG(ha, reg, 1);

	mb[2] = RD_MAILBOX_REG(ha, reg, 2);
@@ -2110,7 +2110,7 @@ qla2x00_configure_local_loop(scsi_qla_host_t *vha) 
		goto cleanup_allocation;



	DEBUG3(printk("scsi(%ld): Entries in ID list (%d)\n",

	    ha->host_no, entries));

	    vha->host_no, entries));

	DEBUG3(qla2x00_dump_buffer((uint8_t *)ha->gid_list,

	    entries * sizeof(struct gid_list_info)));
@@ -3587,7 +3587,7 @@ qla24xx_nvram_config(scsi_qla_host_t *vha) 
	for (cnt = 0, chksum = 0; cnt < ha->nvram_size >> 2; cnt++)

		chksum += le32_to_cpu(*dptr++);



	DEBUG5(printk("scsi(%ld): Contents of NVRAM\n", ha->host_no));

	DEBUG5(printk("scsi(%ld): Contents of NVRAM\n", vha->host_no));

	DEBUG5(qla2x00_dump_buffer((uint8_t *)nv, ha->nvram_size));



	/* Bad NVRAM data, set defaults parameters. */
@@ -4305,7 +4305,7 @@ qla81xx_nvram_config(scsi_qla_host_t *vha) 
	for (cnt = 0, chksum = 0; cnt < ha->nvram_size >> 2; cnt++)

		chksum += le32_to_cpu(*dptr++);



	DEBUG5(printk("scsi(%ld): Contents of NVRAM\n", ha->host_no));

	DEBUG5(printk("scsi(%ld): Contents of NVRAM\n", vha->host_no));

	DEBUG5(qla2x00_dump_buffer((uint8_t *)nv, ha->nvram_size));



	/* Bad NVRAM data, set defaults parameters. */

drivers/scsi/qla2xxx/qla_mbx.c

+1 −1
Original line number Diff line number Diff line
@@ -3393,7 +3393,7 @@ qla2x00_read_edc(scsi_qla_host_t *vha, uint16_t dev, uint16_t adr, 
		DEBUG2_3_11(printk("%s(%ld): failed=%x (%x).\n", __func__,

		    vha->host_no, rval, mcp->mb[0]));

	} else {

		DEBUG11(printk("%s(%ld): done.\n", __func__, ha->host_no));

		DEBUG11(printk("%s(%ld): done.\n", __func__, vha->host_no));

	}



	return rval;

drivers/scsi/qla2xxx/qla_sup.c

+11 −8
Original line number Diff line number Diff line
@@ -219,8 +219,8 @@ qla2x00_write_nvram_word(struct qla_hw_data *ha, uint32_t addr, uint16_t data) 
	wait_cnt = NVR_WAIT_CNT;

	do {

		if (!--wait_cnt) {

			DEBUG9_10(printk("%s(%ld): NVRAM didn't go ready...\n",

			    __func__, vha->host_no));

			DEBUG9_10(qla_printk(KERN_WARNING, ha,

			    "NVRAM didn't go ready...\n"));

			break;

		}

		NVRAM_DELAY();
@@ -349,7 +349,7 @@ qla2x00_clear_nvram_protection(struct qla_hw_data *ha) 
		wait_cnt = NVR_WAIT_CNT;

		do {

			if (!--wait_cnt) {

				DEBUG9_10(qla_printk(

				DEBUG9_10(qla_printk(KERN_WARNING, ha,

				    "NVRAM didn't go ready...\n"));

				break;

			}
@@ -408,7 +408,8 @@ qla2x00_set_nvram_protection(struct qla_hw_data *ha, int stat) 
	wait_cnt = NVR_WAIT_CNT;

	do {

		if (!--wait_cnt) {

			DEBUG9_10(qla_printk("NVRAM didn't go ready...\n"));

			DEBUG9_10(qla_printk(KERN_WARNING, ha,

			    "NVRAM didn't go ready...\n"));

			break;

		}

		NVRAM_DELAY();
@@ -1079,8 +1080,9 @@ qla24xx_write_flash_data(scsi_qla_host_t *vha, uint32_t *dwptr, uint32_t faddr, 
				    0xff0000) | ((fdata >> 16) & 0xff));

			ret = qla24xx_erase_sector(vha, fdata);

			if (ret != QLA_SUCCESS) {

				DEBUG9(qla_printk("Unable to erase sector: "

				    "address=%x.\n", faddr));

				DEBUG9(qla_printk(KERN_WARNING, ha,

				    "Unable to erase sector: address=%x.\n",

				    faddr));

				break;

			}

		}
@@ -1240,8 +1242,9 @@ qla24xx_write_nvram_data(scsi_qla_host_t *vha, uint8_t *buf, uint32_t naddr, 
		ret = qla24xx_write_flash_dword(ha,

		    nvram_data_addr(ha, naddr), cpu_to_le32(*dwptr));

		if (ret != QLA_SUCCESS) {

			DEBUG9(qla_printk("Unable to program nvram address=%x "

			    "data=%x.\n", naddr, *dwptr));

			DEBUG9(qla_printk(KERN_WARNING, ha,

			    "Unable to program nvram address=%x data=%x.\n",

			    naddr, *dwptr));

			break;

		}

	}