[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>

1 files changed, 12 insertions, 11 deletions

diff --git a/drivers/scsi/qla2xxx/qla_attr.c b/drivers/scsi/qla2xxx/qla_attr.c
index e406eae3e08..362353dcb34 100644
--- a/drivers/scsi/qla2xxx/qla_attr.c
+++ b/drivers/scsi/qla2xxx/qla_attr.c
@@ -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;