Commit 10fbb7dd authored by Giridhar Malavali's avatar Giridhar Malavali Committed by James Bottomley
Browse files

[SCSI] qla2xxx: Code cleanup to remove unwanted comments and code. 



Signed-off-by: default avatarGiridhar Malavali <giridhar.malavali@qlogic.com>
Signed-off-by: default avatarLalit Chandivade <lalit.chandivade@qlogic.com>
Signed-off-by: default avatarMadhuranath Iyengar <Madhu.Iyengar@qlogic.com>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@suse.de>
parent c9e8fd5c

drivers/scsi/qla2xxx/qla_nx.c

+0 −36
Original line number Diff line number Diff line
@@ -1253,25 +1253,6 @@ qla82xx_pinit_from_rom(scsi_qla_host_t *vha) 
	return 0;

}



static int

qla82xx_check_for_bad_spd(struct qla_hw_data *ha)

{

	u32 val = 0;

	val = qla82xx_rd_32(ha, BOOT_LOADER_DIMM_STATUS);

	val &= QLA82XX_BOOT_LOADER_MN_ISSUE;

	if (val & QLA82XX_PEG_TUNE_MN_SPD_ZEROED) {

		qla_printk(KERN_INFO, ha,

			"Memory DIMM SPD not programmed. "

			" Assumed valid.\n");

		return 1;

	} else if (val) {

		qla_printk(KERN_INFO, ha,

			"Memory DIMM type incorrect.Info:%08X.\n", val);

		return 2;

	}

	return 0;

}



static int

qla82xx_pci_mem_write_2M(struct qla_hw_data *ha,

		u64 off, void *data, int size)
@@ -1337,11 +1318,6 @@ qla82xx_pci_mem_write_2M(struct qla_hw_data *ha, 
		word[startword+1] |= tmpw >> (sz[0] * 8);

	}



	/*

	 * don't lock here - write_wx gets the lock if each time

	 * write_lock_irqsave(&adapter->adapter_lock, flags);

	 * netxen_nic_pci_change_crbwindow_128M(adapter, 0);

	 */

	for (i = 0; i < loop; i++) {

		temp = off8 + (i << shift_amount);

		qla82xx_wr_32(ha, mem_crb+MIU_TEST_AGT_ADDR_LO, temp);
@@ -1443,12 +1419,6 @@ qla82xx_pci_mem_read_2M(struct qla_hw_data *ha, 
	off0[1] = 0;

	sz[1] = size - sz[0];



	/*

	 * don't lock here - write_wx gets the lock if each time

	 * write_lock_irqsave(&adapter->adapter_lock, flags);

	 * netxen_nic_pci_change_crbwindow_128M(adapter, 0);

	 */



	for (i = 0; i < loop; i++) {

		temp = off8 + (i << shift_amount);

		qla82xx_wr_32(ha, mem_crb + MIU_TEST_AGT_ADDR_LO, temp);
@@ -1481,11 +1451,6 @@ qla82xx_pci_mem_read_2M(struct qla_hw_data *ha, 
		}

	}



	/*

	 * netxen_nic_pci_change_crbwindow_128M(adapter, 1);

	 * write_unlock_irqrestore(&adapter->adapter_lock, flags);

	 */



	if (j >= MAX_CTL_CHECK)

		return -1;
@@ -1916,7 +1881,6 @@ qla82xx_check_cmdpeg_state(struct qla_hw_data *ha) 
	qla_printk(KERN_INFO, ha,

	    "Cmd Peg initialization failed: 0x%x.\n", val);



	qla82xx_check_for_bad_spd(ha);

	val = qla82xx_rd_32(ha, QLA82XX_ROMUSB_GLB_PEGTUNE_DONE);

	read_lock(&ha->hw_lock);

	qla82xx_wr_32(ha, CRB_CMDPEG_STATE, PHAN_INITIALIZE_FAILED);

drivers/scsi/qla2xxx/qla_nx.h

+0 −2
Original line number Diff line number Diff line
@@ -523,8 +523,6 @@ 
# define QLA82XX_CAM_RAM_BASE		(QLA82XX_CRB_CAM + 0x02000)

# define QLA82XX_CAM_RAM(reg)		(QLA82XX_CAM_RAM_BASE + (reg))



#define QLA82XX_PEG_TUNE_MN_SPD_ZEROED	0x80000000

#define QLA82XX_BOOT_LOADER_MN_ISSUE	0xff00ffff

#define QLA82XX_PORT_MODE_ADDR		(QLA82XX_CAM_RAM(0x24))

#define QLA82XX_PEG_HALT_STATUS1	(QLA82XX_CAM_RAM(0xa8))

#define QLA82XX_PEG_HALT_STATUS2	(QLA82XX_CAM_RAM(0xac))

CRA Git | Maintained and supported by SUSTech CRA and CCSE