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

Commit fd34f556 authored Jul 19, 2007 by Andrew Vasquez Committed by James Bottomley Jul 20, 2007

[SCSI] qla2xxx: Re-factor isp_operations to static structures.



In preparation for new ISP types.

Signed-off-by: Andrew Vasquez <andrew.vasquez@qlogic.com>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>

parent 8084fe16

drivers/scsi/qla2xxx/qla_attr.c

+12 −11

Original line number	Diff line number	Diff line
		@@ -98,7 +98,7 @@ qla2x00_sysfs_read_nvram(struct kobject *kobj,

		/* Read NVRAM. */
		spin_lock_irqsave(&ha->hardware_lock, flags);
		ha->isp_ops.read_nvram(ha, (uint8_t *)buf, ha->nvram_base,
		ha->isp_ops->read_nvram(ha, (uint8_t *)buf, ha->nvram_base,
		ha->nvram_size);
		spin_unlock_irqrestore(&ha->hardware_lock, flags);

		@@ -143,7 +143,7 @@ qla2x00_sysfs_write_nvram(struct kobject *kobj,

		/* Write NVRAM. */
		spin_lock_irqsave(&ha->hardware_lock, flags);
		ha->isp_ops.write_nvram(ha, (uint8_t *)buf, ha->nvram_base, count);
		ha->isp_ops->write_nvram(ha, (uint8_t *)buf, ha->nvram_base, count);
		spin_unlock_irqrestore(&ha->hardware_lock, flags);

		set_bit(ISP_ABORT_NEEDED, &ha->dpc_flags);
		@@ -252,7 +252,7 @@ qla2x00_sysfs_write_optrom_ctl(struct kobject *kobj,
		}

		memset(ha->optrom_buffer, 0, ha->optrom_size);
		ha->isp_ops.read_optrom(ha, ha->optrom_buffer, 0,
		ha->isp_ops->read_optrom(ha, ha->optrom_buffer, 0,
		ha->optrom_size);
		break;
		case 2:
		@@ -275,7 +275,7 @@ qla2x00_sysfs_write_optrom_ctl(struct kobject *kobj,
		if (ha->optrom_state != QLA_SWRITING)
		break;

		ha->isp_ops.write_optrom(ha, ha->optrom_buffer, 0,
		ha->isp_ops->write_optrom(ha, ha->optrom_buffer, 0,
		ha->optrom_size);
		break;
		}
		@@ -305,7 +305,8 @@ qla2x00_sysfs_read_vpd(struct kobject *kobj,

		/* Read NVRAM. */
		spin_lock_irqsave(&ha->hardware_lock, flags);
		ha->isp_ops.read_nvram(ha, (uint8_t *)buf, ha->vpd_base, ha->vpd_size);
		ha->isp_ops->read_nvram(ha, (uint8_t *)buf, ha->vpd_base,
		ha->vpd_size);
		spin_unlock_irqrestore(&ha->hardware_lock, flags);

		return ha->vpd_size;
		@@ -325,7 +326,7 @@ qla2x00_sysfs_write_vpd(struct kobject *kobj,

		/* Write NVRAM. */
		spin_lock_irqsave(&ha->hardware_lock, flags);
		ha->isp_ops.write_nvram(ha, (uint8_t *)buf, ha->vpd_base, count);
		ha->isp_ops->write_nvram(ha, (uint8_t *)buf, ha->vpd_base, count);
		spin_unlock_irqrestore(&ha->hardware_lock, flags);

		return count;
		@@ -437,7 +438,7 @@ qla2x00_free_sysfs_attr(scsi_qla_host_t *ha)
		}

		if (ha->beacon_blink_led == 1)
		ha->isp_ops.beacon_off(ha);
		ha->isp_ops->beacon_off(ha);
		}

		/* Scsi_Host attributes. */
		@@ -455,7 +456,7 @@ qla2x00_fw_version_show(struct class_device cdev, char buf)
		char fw_str[30];

		return snprintf(buf, PAGE_SIZE, "%s\n",
		ha->isp_ops.fw_version_str(ha, fw_str));
		ha->isp_ops->fw_version_str(ha, fw_str));
		}

		static ssize_t
		@@ -507,7 +508,7 @@ qla2x00_pci_info_show(struct class_device cdev, char buf)
		char pci_info[30];

		return snprintf(buf, PAGE_SIZE, "%s\n",
		ha->isp_ops.pci_info_str(ha, pci_info));
		ha->isp_ops->pci_info_str(ha, pci_info));
		}

		static ssize_t
		@@ -652,9 +653,9 @@ qla2x00_beacon_store(struct class_device cdev, const char buf,
		return -EINVAL;

		if (val)
		rval = ha->isp_ops.beacon_on(ha);
		rval = ha->isp_ops->beacon_on(ha);
		else
		rval = ha->isp_ops.beacon_off(ha);
		rval = ha->isp_ops->beacon_off(ha);

		if (rval != QLA_SUCCESS)
		count = 0;

drivers/scsi/qla2xxx/qla_def.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -2286,7 +2286,7 @@ typedef struct scsi_qla_host {
		uint16_t rsp_ring_index; /* Current index. */
		uint16_t response_q_length;

		struct isp_operations isp_ops;
		struct isp_operations *isp_ops;

		/* Outstandings ISP commands. */
		srb_t *outstanding_cmds[MAX_OUTSTANDING_COMMANDS];

drivers/scsi/qla2xxx/qla_gs.c

+19 −14

Original line number	Diff line number	Diff line
		@@ -180,7 +180,8 @@ qla2x00_ga_nxt(scsi_qla_host_t ha, fc_port_t fcport)

		/* Issue GA_NXT */
		/* Prepare common MS IOCB */
		ms_pkt = ha->isp_ops.prep_ms_iocb(ha, GA_NXT_REQ_SIZE, GA_NXT_RSP_SIZE);
		ms_pkt = ha->isp_ops->prep_ms_iocb(ha, GA_NXT_REQ_SIZE,
		GA_NXT_RSP_SIZE);

		/* Prepare CT request */
		ct_req = qla2x00_prep_ct_req(&ha->ct_sns->p.req, GA_NXT_CMD,
		@@ -266,7 +267,8 @@ qla2x00_gid_pt(scsi_qla_host_t ha, sw_info_t list)

		/* Issue GID_PT */
		/* Prepare common MS IOCB */
		ms_pkt = ha->isp_ops.prep_ms_iocb(ha, GID_PT_REQ_SIZE, GID_PT_RSP_SIZE);
		ms_pkt = ha->isp_ops->prep_ms_iocb(ha, GID_PT_REQ_SIZE,
		GID_PT_RSP_SIZE);

		/* Prepare CT request */
		ct_req = qla2x00_prep_ct_req(&ha->ct_sns->p.req, GID_PT_CMD,
		@@ -338,7 +340,7 @@ qla2x00_gpn_id(scsi_qla_host_t ha, sw_info_t list)
		for (i = 0; i < MAX_FIBRE_DEVICES; i++) {
		/* Issue GPN_ID */
		/* Prepare common MS IOCB */
		ms_pkt = ha->isp_ops.prep_ms_iocb(ha, GPN_ID_REQ_SIZE,
		ms_pkt = ha->isp_ops->prep_ms_iocb(ha, GPN_ID_REQ_SIZE,
		GPN_ID_RSP_SIZE);

		/* Prepare CT request */
		@@ -399,7 +401,7 @@ qla2x00_gnn_id(scsi_qla_host_t ha, sw_info_t list)
		for (i = 0; i < MAX_FIBRE_DEVICES; i++) {
		/* Issue GNN_ID */
		/* Prepare common MS IOCB */
		ms_pkt = ha->isp_ops.prep_ms_iocb(ha, GNN_ID_REQ_SIZE,
		ms_pkt = ha->isp_ops->prep_ms_iocb(ha, GNN_ID_REQ_SIZE,
		GNN_ID_RSP_SIZE);

		/* Prepare CT request */
		@@ -473,7 +475,8 @@ qla2x00_rft_id(scsi_qla_host_t *ha)

		/* Issue RFT_ID */
		/* Prepare common MS IOCB */
		ms_pkt = ha->isp_ops.prep_ms_iocb(ha, RFT_ID_REQ_SIZE, RFT_ID_RSP_SIZE);
		ms_pkt = ha->isp_ops->prep_ms_iocb(ha, RFT_ID_REQ_SIZE,
		RFT_ID_RSP_SIZE);

		/* Prepare CT request */
		ct_req = qla2x00_prep_ct_req(&ha->ct_sns->p.req, RFT_ID_CMD,
		@@ -528,7 +531,8 @@ qla2x00_rff_id(scsi_qla_host_t *ha)

		/* Issue RFF_ID */
		/* Prepare common MS IOCB */
		ms_pkt = ha->isp_ops.prep_ms_iocb(ha, RFF_ID_REQ_SIZE, RFF_ID_RSP_SIZE);
		ms_pkt = ha->isp_ops->prep_ms_iocb(ha, RFF_ID_REQ_SIZE,
		RFF_ID_RSP_SIZE);

		/* Prepare CT request */
		ct_req = qla2x00_prep_ct_req(&ha->ct_sns->p.req, RFF_ID_CMD,
		@@ -582,7 +586,8 @@ qla2x00_rnn_id(scsi_qla_host_t *ha)

		/* Issue RNN_ID */
		/* Prepare common MS IOCB */
		ms_pkt = ha->isp_ops.prep_ms_iocb(ha, RNN_ID_REQ_SIZE, RNN_ID_RSP_SIZE);
		ms_pkt = ha->isp_ops->prep_ms_iocb(ha, RNN_ID_REQ_SIZE,
		RNN_ID_RSP_SIZE);

		/* Prepare CT request */
		ct_req = qla2x00_prep_ct_req(&ha->ct_sns->p.req, RNN_ID_CMD,
		@@ -645,7 +650,7 @@ qla2x00_rsnn_nn(scsi_qla_host_t *ha)
		/* Issue RSNN_NN */
		/* Prepare common MS IOCB */
		/* Request size adjusted after CT preparation */
		ms_pkt = ha->isp_ops.prep_ms_iocb(ha, 0, RSNN_NN_RSP_SIZE);
		ms_pkt = ha->isp_ops->prep_ms_iocb(ha, 0, RSNN_NN_RSP_SIZE);

		/* Prepare CT request */
		ct_req = qla2x00_prep_ct_req(&ha->ct_sns->p.req, RSNN_NN_CMD,
		@@ -1102,7 +1107,7 @@ qla2x00_mgmt_svr_login(scsi_qla_host_t *ha)
		if (ha->flags.management_server_logged_in)
		return ret;

		ha->isp_ops.fabric_login(ha, ha->mgmt_svr_loop_id, 0xff, 0xff, 0xfa,
		ha->isp_ops->fabric_login(ha, ha->mgmt_svr_loop_id, 0xff, 0xff, 0xfa,
		mb, BIT_1);
		if (mb[0] != MBS_COMMAND_COMPLETE) {
		DEBUG2_13(printk("%s(%ld): Failed MANAGEMENT_SERVER login: "
		@@ -1253,7 +1258,7 @@ qla2x00_fdmi_rhba(scsi_qla_host_t *ha)
		/* Issue RHBA */
		/* Prepare common MS IOCB */
		/* Request size adjusted after CT preparation */
		ms_pkt = ha->isp_ops.prep_ms_fdmi_iocb(ha, 0, RHBA_RSP_SIZE);
		ms_pkt = ha->isp_ops->prep_ms_fdmi_iocb(ha, 0, RHBA_RSP_SIZE);

		/* Prepare CT request */
		ct_req = qla2x00_prep_ct_fdmi_req(&ha->ct_sns->p.req, RHBA_CMD,
		@@ -1373,7 +1378,7 @@ qla2x00_fdmi_rhba(scsi_qla_host_t *ha)
		/* Firmware version */
		eiter = (struct ct_fdmi_hba_attr *) (entries + size);
		eiter->type = __constant_cpu_to_be16(FDMI_HBA_FIRMWARE_VERSION);
		ha->isp_ops.fw_version_str(ha, eiter->a.fw_version);
		ha->isp_ops->fw_version_str(ha, eiter->a.fw_version);
		alen = strlen(eiter->a.fw_version);
		alen += (alen & 3) ? (4 - (alen & 3)) : 4;
		eiter->len = cpu_to_be16(4 + alen);
		@@ -1439,7 +1444,7 @@ qla2x00_fdmi_dhba(scsi_qla_host_t *ha)

		/* Issue RPA */
		/* Prepare common MS IOCB */
		ms_pkt = ha->isp_ops.prep_ms_fdmi_iocb(ha, DHBA_REQ_SIZE,
		ms_pkt = ha->isp_ops->prep_ms_fdmi_iocb(ha, DHBA_REQ_SIZE,
		DHBA_RSP_SIZE);

		/* Prepare CT request */
		@@ -1497,7 +1502,7 @@ qla2x00_fdmi_rpa(scsi_qla_host_t *ha)
		/* Issue RPA */
		/* Prepare common MS IOCB */
		/* Request size adjusted after CT preparation */
		ms_pkt = ha->isp_ops.prep_ms_fdmi_iocb(ha, 0, RPA_RSP_SIZE);
		ms_pkt = ha->isp_ops->prep_ms_fdmi_iocb(ha, 0, RPA_RSP_SIZE);

		/* Prepare CT request */
		ct_req = qla2x00_prep_ct_fdmi_req(&ha->ct_sns->p.req, RPA_CMD,
		@@ -1697,7 +1702,7 @@ qla2x00_gfpn_id(scsi_qla_host_t ha, sw_info_t list)
		memset(list[i].fabric_port_name, 0, WWN_SIZE);

		/* Prepare common MS IOCB */
		ms_pkt = ha->isp_ops.prep_ms_iocb(ha, GFPN_ID_REQ_SIZE,
		ms_pkt = ha->isp_ops->prep_ms_iocb(ha, GFPN_ID_REQ_SIZE,
		GFPN_ID_RSP_SIZE);

		/* Prepare CT request */

drivers/scsi/qla2xxx/qla_init.c

+27 −27

Original line number	Diff line number	Diff line
		@@ -79,20 +79,20 @@ qla2x00_initialize_adapter(scsi_qla_host_t *ha)
		set_bit(REGISTER_FDMI_NEEDED, &ha->dpc_flags);

		qla_printk(KERN_INFO, ha, "Configuring PCI space...\n");
		rval = ha->isp_ops.pci_config(ha);
		rval = ha->isp_ops->pci_config(ha);
		if (rval) {
		DEBUG2(printk("scsi(%ld): Unable to configure PCI space.\n",
		ha->host_no));
		return (rval);
		}

		ha->isp_ops.reset_chip(ha);
		ha->isp_ops->reset_chip(ha);

		ha->isp_ops.get_flash_version(ha, ha->request_ring);
		ha->isp_ops->get_flash_version(ha, ha->request_ring);

		qla_printk(KERN_INFO, ha, "Configure NVRAM parameters...\n");

		ha->isp_ops.nvram_config(ha);
		ha->isp_ops->nvram_config(ha);

		if (ha->flags.disable_serdes) {
		/* Mask HBA via NVRAM settings? */
		@@ -108,7 +108,7 @@ qla2x00_initialize_adapter(scsi_qla_host_t *ha)
		qla_printk(KERN_INFO, ha, "Verifying loaded RISC code...\n");

		if (qla2x00_isp_firmware(ha) != QLA_SUCCESS) {
		rval = ha->isp_ops.chip_diag(ha);
		rval = ha->isp_ops->chip_diag(ha);
		if (rval)
		return (rval);
		rval = qla2x00_setup_chip(ha);
		@@ -351,7 +351,7 @@ qla2x00_reset_chip(scsi_qla_host_t *ha)
		uint32_t cnt;
		uint16_t cmd;

		ha->isp_ops.disable_intrs(ha);
		ha->isp_ops->disable_intrs(ha);

		spin_lock_irqsave(&ha->hardware_lock, flags);

		@@ -551,7 +551,7 @@ qla24xx_reset_risc(scsi_qla_host_t *ha)
		void
		qla24xx_reset_chip(scsi_qla_host_t *ha)
		{
		ha->isp_ops.disable_intrs(ha);
		ha->isp_ops->disable_intrs(ha);

		/* Perform RISC reset. */
		qla24xx_reset_risc(ha);
		@@ -879,7 +879,7 @@ qla2x00_setup_chip(scsi_qla_host_t *ha)
		uint32_t srisc_address = 0;

		/* Load firmware sequences */
		rval = ha->isp_ops.load_risc(ha, &srisc_address);
		rval = ha->isp_ops->load_risc(ha, &srisc_address);
		if (rval == QLA_SUCCESS) {
		DEBUG(printk("scsi(%ld): Verifying Checksum of loaded RISC "
		"code.\n", ha->host_no));
		@@ -1130,12 +1130,12 @@ qla2x00_init_rings(scsi_qla_host_t *ha)
		/* Initialize response queue entries */
		qla2x00_init_response_q_entries(ha);

		ha->isp_ops.config_rings(ha);
		ha->isp_ops->config_rings(ha);

		spin_unlock_irqrestore(&ha->hardware_lock, flags);

		/* Update any ISP specific firmware options before initialization. */
		ha->isp_ops.update_fw_options(ha);
		ha->isp_ops->update_fw_options(ha);

		DEBUG(printk("scsi(%ld): Issue init firmware.\n", ha->host_no));

		@@ -1459,7 +1459,7 @@ qla2x00_nvram_config(scsi_qla_host_t *ha)
		ha->nvram_base = 0x80;

		/* Get NVRAM data and calculate checksum. */
		ha->isp_ops.read_nvram(ha, ptr, ha->nvram_base, ha->nvram_size);
		ha->isp_ops->read_nvram(ha, ptr, ha->nvram_base, ha->nvram_size);
		for (cnt = 0, chksum = 0; cnt < ha->nvram_size; cnt++)
		chksum += *ptr++;

		@@ -2298,7 +2298,7 @@ qla2x00_configure_fabric(scsi_qla_host_t *ha)
		loop_id = NPH_SNS;
		else
		loop_id = SIMPLE_NAME_SERVER;
		ha->isp_ops.fabric_login(ha, loop_id, 0xff, 0xff,
		ha->isp_ops->fabric_login(ha, loop_id, 0xff, 0xff,
		0xfc, mb, BIT_1 \| BIT_0);
		if (mb[0] != MBS_COMMAND_COMPLETE) {
		DEBUG2(qla_printk(KERN_INFO, ha,
		@@ -2355,7 +2355,7 @@ qla2x00_configure_fabric(scsi_qla_host_t *ha)
		(fcport->flags & FCF_TAPE_PRESENT) == 0 &&
		fcport->port_type != FCT_INITIATOR &&
		fcport->port_type != FCT_BROADCAST) {
		ha->isp_ops.fabric_logout(ha,
		ha->isp_ops->fabric_logout(ha,
		fcport->loop_id,
		fcport->d_id.b.domain,
		fcport->d_id.b.area,
		@@ -2664,7 +2664,7 @@ qla2x00_find_all_fabric_devs(scsi_qla_host_t ha, struct list_head new_fcports)
		(fcport->flags & FCF_TAPE_PRESENT) == 0 &&
		fcport->port_type != FCT_INITIATOR &&
		fcport->port_type != FCT_BROADCAST) {
		ha->isp_ops.fabric_logout(ha, fcport->loop_id,
		ha->isp_ops->fabric_logout(ha, fcport->loop_id,
		fcport->d_id.b.domain, fcport->d_id.b.area,
		fcport->d_id.b.al_pa);
		fcport->loop_id = FC_NO_LOOP_ID;
		@@ -2919,7 +2919,7 @@ qla2x00_fabric_dev_login(scsi_qla_host_t ha, fc_port_t fcport,
		opts \|= BIT_1;
		rval = qla2x00_get_port_database(ha, fcport, opts);
		if (rval != QLA_SUCCESS) {
		ha->isp_ops.fabric_logout(ha, fcport->loop_id,
		ha->isp_ops->fabric_logout(ha, fcport->loop_id,
		fcport->d_id.b.domain, fcport->d_id.b.area,
		fcport->d_id.b.al_pa);
		qla2x00_mark_device_lost(ha, fcport, 1, 0);
		@@ -2964,7 +2964,7 @@ qla2x00_fabric_login(scsi_qla_host_t ha, fc_port_t fcport,
		fcport->d_id.b.area, fcport->d_id.b.al_pa));

		/* Login fcport on switch. */
		ha->isp_ops.fabric_login(ha, fcport->loop_id,
		ha->isp_ops->fabric_login(ha, fcport->loop_id,
		fcport->d_id.b.domain, fcport->d_id.b.area,
		fcport->d_id.b.al_pa, mb, BIT_0);
		if (mb[0] == MBS_PORT_ID_USED) {
		@@ -3032,7 +3032,7 @@ qla2x00_fabric_login(scsi_qla_host_t ha, fc_port_t fcport,
		* dead.
		*/
		*next_loopid = fcport->loop_id;
		ha->isp_ops.fabric_logout(ha, fcport->loop_id,
		ha->isp_ops->fabric_logout(ha, fcport->loop_id,
		fcport->d_id.b.domain, fcport->d_id.b.area,
		fcport->d_id.b.al_pa);
		qla2x00_mark_device_lost(ha, fcport, 1, 0);
		@@ -3050,7 +3050,7 @@ qla2x00_fabric_login(scsi_qla_host_t ha, fc_port_t fcport,
		fcport->d_id.b.al_pa, fcport->loop_id, jiffies));

		*next_loopid = fcport->loop_id;
		ha->isp_ops.fabric_logout(ha, fcport->loop_id,
		ha->isp_ops->fabric_logout(ha, fcport->loop_id,
		fcport->d_id.b.domain, fcport->d_id.b.area,
		fcport->d_id.b.al_pa);
		fcport->loop_id = FC_NO_LOOP_ID;
		@@ -3206,7 +3206,7 @@ qla2x00_abort_isp(scsi_qla_host_t *ha)

		qla_printk(KERN_INFO, ha,
		"Performing ISP error recovery - ha= %p.\n", ha);
		ha->isp_ops.reset_chip(ha);
		ha->isp_ops->reset_chip(ha);

		atomic_set(&ha->loop_down_timer, LOOP_DOWN_TIME);
		if (atomic_read(&ha->loop_state) != LOOP_DOWN) {
		@@ -3232,9 +3232,9 @@ qla2x00_abort_isp(scsi_qla_host_t *ha)
		}
		spin_unlock_irqrestore(&ha->hardware_lock, flags);

		ha->isp_ops.get_flash_version(ha, ha->request_ring);
		ha->isp_ops->get_flash_version(ha, ha->request_ring);

		ha->isp_ops.nvram_config(ha);
		ha->isp_ops->nvram_config(ha);

		if (!qla2x00_restart_isp(ha)) {
		clear_bit(RESET_MARKER_NEEDED, &ha->dpc_flags);
		@@ -3249,7 +3249,7 @@ qla2x00_abort_isp(scsi_qla_host_t *ha)

		ha->flags.online = 1;

		ha->isp_ops.enable_intrs(ha);
		ha->isp_ops->enable_intrs(ha);

		ha->isp_abort_cnt = 0;
		clear_bit(ISP_ABORT_RETRY, &ha->dpc_flags);
		@@ -3274,7 +3274,7 @@ qla2x00_abort_isp(scsi_qla_host_t *ha)
		* The next call disables the board
		* completely.
		*/
		ha->isp_ops.reset_adapter(ha);
		ha->isp_ops->reset_adapter(ha);
		ha->flags.online = 0;
		clear_bit(ISP_ABORT_RETRY,
		&ha->dpc_flags);
		@@ -3331,7 +3331,7 @@ qla2x00_restart_isp(scsi_qla_host_t *ha)
		/* If firmware needs to be loaded */
		if (qla2x00_isp_firmware(ha)) {
		ha->flags.online = 0;
		if (!(status = ha->isp_ops.chip_diag(ha))) {
		if (!(status = ha->isp_ops->chip_diag(ha))) {
		if (IS_QLA2100(ha) \|\| IS_QLA2200(ha)) {
		status = qla2x00_setup_chip(ha);
		goto done;
		@@ -3423,7 +3423,7 @@ qla2x00_reset_adapter(scsi_qla_host_t *ha)
		struct device_reg_2xxx __iomem *reg = &ha->iobase->isp;

		ha->flags.online = 0;
		ha->isp_ops.disable_intrs(ha);
		ha->isp_ops->disable_intrs(ha);

		spin_lock_irqsave(&ha->hardware_lock, flags);
		WRT_REG_WORD(&reg->hccr, HCCR_RESET_RISC);
		@@ -3440,7 +3440,7 @@ qla24xx_reset_adapter(scsi_qla_host_t *ha)
		struct device_reg_24xx __iomem *reg = &ha->iobase->isp24;

		ha->flags.online = 0;
		ha->isp_ops.disable_intrs(ha);
		ha->isp_ops->disable_intrs(ha);

		spin_lock_irqsave(&ha->hardware_lock, flags);
		WRT_REG_DWORD(&reg->hccr, HCCRX_SET_RISC_RESET);
		@@ -3498,7 +3498,7 @@ qla24xx_nvram_config(scsi_qla_host_t *ha)

		/* Get NVRAM data and calculate checksum. */
		dptr = (uint32_t *)nv;
		ha->isp_ops.read_nvram(ha, (uint8_t *)dptr, ha->nvram_base,
		ha->isp_ops->read_nvram(ha, (uint8_t *)dptr, ha->nvram_base,
		ha->nvram_size);
		for (cnt = 0, chksum = 0; cnt < ha->nvram_size >> 2; cnt++)
		chksum += le32_to_cpu(*dptr++);

drivers/scsi/qla2xxx/qla_inline.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -104,7 +104,7 @@ static __inline__ void qla2x00_poll(scsi_qla_host_t *);
		static inline void
		qla2x00_poll(scsi_qla_host_t *ha)
		{
		ha->isp_ops.intr_handler(0, ha);
		ha->isp_ops->intr_handler(0, ha);
		}

		static __inline__ void qla2x00_check_fabric_devices(scsi_qla_host_t *);