aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/scsi/qla2xxx/qla_sup.c
diff options
context:
space:
mode:
authorAndrew Vasquez <andrew.vasquez@qlogic.com>2007-07-19 18:06:00 -0400
committerJames Bottomley <jejb@mulgrave.localdomain>2007-07-20 10:24:22 -0400
commitfd34f55694a784052981977cb84c50ea369ffc68 (patch)
treef80c089762ff6a2ed53edc29a1ccf05d5a4c4d0d /drivers/scsi/qla2xxx/qla_sup.c
parent8084fe168a5252548cdddf2ed181c337fecd0523 (diff)
[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>
Diffstat (limited to 'drivers/scsi/qla2xxx/qla_sup.c')
-rw-r--r--drivers/scsi/qla2xxx/qla_sup.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/scsi/qla2xxx/qla_sup.c b/drivers/scsi/qla2xxx/qla_sup.c
index 206bda093da2..aafd60467230 100644
--- a/drivers/scsi/qla2xxx/qla_sup.c
+++ b/drivers/scsi/qla2xxx/qla_sup.c
@@ -919,7 +919,7 @@ qla2x00_beacon_off(struct scsi_qla_host *ha)
919 else 919 else
920 ha->beacon_color_state = QLA_LED_GRN_ON; 920 ha->beacon_color_state = QLA_LED_GRN_ON;
921 921
922 ha->isp_ops.beacon_blink(ha); /* This turns green LED off */ 922 ha->isp_ops->beacon_blink(ha); /* This turns green LED off */
923 923
924 ha->fw_options[1] &= ~FO1_SET_EMPHASIS_SWING; 924 ha->fw_options[1] &= ~FO1_SET_EMPHASIS_SWING;
925 ha->fw_options[1] &= ~FO1_DISABLE_GPIO6_7; 925 ha->fw_options[1] &= ~FO1_DISABLE_GPIO6_7;
@@ -1031,7 +1031,7 @@ qla24xx_beacon_off(struct scsi_qla_host *ha)
1031 ha->beacon_blink_led = 0; 1031 ha->beacon_blink_led = 0;
1032 ha->beacon_color_state = QLA_LED_ALL_ON; 1032 ha->beacon_color_state = QLA_LED_ALL_ON;
1033 1033
1034 ha->isp_ops.beacon_blink(ha); /* Will flip to all off. */ 1034 ha->isp_ops->beacon_blink(ha); /* Will flip to all off. */
1035 1035
1036 /* Give control back to firmware. */ 1036 /* Give control back to firmware. */
1037 spin_lock_irqsave(&ha->hardware_lock, flags); 1037 spin_lock_irqsave(&ha->hardware_lock, flags);
@@ -1419,7 +1419,7 @@ qla2x00_suspend_hba(struct scsi_qla_host *ha)
1419 1419
1420 /* Suspend HBA. */ 1420 /* Suspend HBA. */
1421 scsi_block_requests(ha->host); 1421 scsi_block_requests(ha->host);
1422 ha->isp_ops.disable_intrs(ha); 1422 ha->isp_ops->disable_intrs(ha);
1423 set_bit(MBX_UPDATE_FLASH_ACTIVE, &ha->mbx_cmd_flags); 1423 set_bit(MBX_UPDATE_FLASH_ACTIVE, &ha->mbx_cmd_flags);
1424 1424
1425 /* Pause RISC. */ 1425 /* Pause RISC. */
@@ -1705,7 +1705,7 @@ qla24xx_read_optrom_data(struct scsi_qla_host *ha, uint8_t *buf,
1705{ 1705{
1706 /* Suspend HBA. */ 1706 /* Suspend HBA. */
1707 scsi_block_requests(ha->host); 1707 scsi_block_requests(ha->host);
1708 ha->isp_ops.disable_intrs(ha); 1708 ha->isp_ops->disable_intrs(ha);
1709 set_bit(MBX_UPDATE_FLASH_ACTIVE, &ha->mbx_cmd_flags); 1709 set_bit(MBX_UPDATE_FLASH_ACTIVE, &ha->mbx_cmd_flags);
1710 1710
1711 /* Go with read. */ 1711 /* Go with read. */
@@ -1713,7 +1713,7 @@ qla24xx_read_optrom_data(struct scsi_qla_host *ha, uint8_t *buf,
1713 1713
1714 /* Resume HBA. */ 1714 /* Resume HBA. */
1715 clear_bit(MBX_UPDATE_FLASH_ACTIVE, &ha->mbx_cmd_flags); 1715 clear_bit(MBX_UPDATE_FLASH_ACTIVE, &ha->mbx_cmd_flags);
1716 ha->isp_ops.enable_intrs(ha); 1716 ha->isp_ops->enable_intrs(ha);
1717 scsi_unblock_requests(ha->host); 1717 scsi_unblock_requests(ha->host);
1718 1718
1719 return buf; 1719 return buf;
@@ -1727,7 +1727,7 @@ qla24xx_write_optrom_data(struct scsi_qla_host *ha, uint8_t *buf,
1727 1727
1728 /* Suspend HBA. */ 1728 /* Suspend HBA. */
1729 scsi_block_requests(ha->host); 1729 scsi_block_requests(ha->host);
1730 ha->isp_ops.disable_intrs(ha); 1730 ha->isp_ops->disable_intrs(ha);
1731 set_bit(MBX_UPDATE_FLASH_ACTIVE, &ha->mbx_cmd_flags); 1731 set_bit(MBX_UPDATE_FLASH_ACTIVE, &ha->mbx_cmd_flags);
1732 1732
1733 /* Go with write. */ 1733 /* Go with write. */