diff options
author | Andrew Vasquez <andrew.vasquez@qlogic.com> | 2006-05-17 18:09:27 -0400 |
---|---|---|
committer | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2006-05-20 10:43:44 -0400 |
commit | 4971cd221ad3f1266b87aa0e996d082d91bac2a6 (patch) | |
tree | d4fc40793c825ecdb788533efc2d1376fa51b03f /drivers/scsi/qla2xxx/qla_init.c | |
parent | 75bc4190701d3c6bdffdc21c8a9e17751de9f77a (diff) |
[SCSI] qla2xxx: Remove unused port-type RSCN handling code.
Expandind on the previous commit:
commit 79f89a4296ff22f09baf538d4ff2a6d0c3097a73
Author: andrew.vasquez@qlogic.com <andrew.vasquez@qlogic.com>
Date: Fri Jan 13 17:05:58 2006 -0800
[SCSI] qla2xxx: Disable port-type RSCN handling via driver state-machine.
and given:
- the process-context requirements of the FC transport
rport-APIs.
- lack of port-type RSCN processing logic for ISP24xx and newer
chips.
it's time now to remove the state-machine logic from mainline.
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_init.c')
-rw-r--r-- | drivers/scsi/qla2xxx/qla_init.c | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/drivers/scsi/qla2xxx/qla_init.c b/drivers/scsi/qla2xxx/qla_init.c index 7e18b9c12654..7b48c655b766 100644 --- a/drivers/scsi/qla2xxx/qla_init.c +++ b/drivers/scsi/qla2xxx/qla_init.c | |||
@@ -1708,7 +1708,6 @@ qla2x00_alloc_fcport(scsi_qla_host_t *ha, gfp_t flags) | |||
1708 | fcport->ha = ha; | 1708 | fcport->ha = ha; |
1709 | fcport->port_type = FCT_UNKNOWN; | 1709 | fcport->port_type = FCT_UNKNOWN; |
1710 | fcport->loop_id = FC_NO_LOOP_ID; | 1710 | fcport->loop_id = FC_NO_LOOP_ID; |
1711 | fcport->iodesc_idx_sent = IODESC_INVALID_INDEX; | ||
1712 | atomic_set(&fcport->state, FCS_UNCONFIGURED); | 1711 | atomic_set(&fcport->state, FCS_UNCONFIGURED); |
1713 | fcport->flags = FCF_RLC_SUPPORT; | 1712 | fcport->flags = FCF_RLC_SUPPORT; |
1714 | fcport->supported_classes = FC_COS_UNSPECIFIED; | 1713 | fcport->supported_classes = FC_COS_UNSPECIFIED; |
@@ -2563,7 +2562,6 @@ static int | |||
2563 | qla2x00_device_resync(scsi_qla_host_t *ha) | 2562 | qla2x00_device_resync(scsi_qla_host_t *ha) |
2564 | { | 2563 | { |
2565 | int rval; | 2564 | int rval; |
2566 | int rval2; | ||
2567 | uint32_t mask; | 2565 | uint32_t mask; |
2568 | fc_port_t *fcport; | 2566 | fc_port_t *fcport; |
2569 | uint32_t rscn_entry; | 2567 | uint32_t rscn_entry; |
@@ -2619,17 +2617,6 @@ qla2x00_device_resync(scsi_qla_host_t *ha) | |||
2619 | 2617 | ||
2620 | switch (format) { | 2618 | switch (format) { |
2621 | case 0: | 2619 | case 0: |
2622 | if (ql2xprocessrscn && | ||
2623 | !IS_QLA2100(ha) && !IS_QLA2200(ha) && | ||
2624 | !IS_QLA6312(ha) && !IS_QLA6322(ha) && | ||
2625 | !IS_QLA24XX(ha) && !IS_QLA54XX(ha) && | ||
2626 | ha->flags.init_done) { | ||
2627 | /* Handle port RSCN via asyncronous IOCBs */ | ||
2628 | rval2 = qla2x00_handle_port_rscn(ha, rscn_entry, | ||
2629 | NULL, 0); | ||
2630 | if (rval2 == QLA_SUCCESS) | ||
2631 | continue; | ||
2632 | } | ||
2633 | mask = 0xffffff; | 2620 | mask = 0xffffff; |
2634 | break; | 2621 | break; |
2635 | case 1: | 2622 | case 1: |
@@ -2647,10 +2634,6 @@ qla2x00_device_resync(scsi_qla_host_t *ha) | |||
2647 | 2634 | ||
2648 | rval = QLA_SUCCESS; | 2635 | rval = QLA_SUCCESS; |
2649 | 2636 | ||
2650 | /* Abort any outstanding IO descriptors. */ | ||
2651 | if (!IS_QLA2100(ha) && !IS_QLA2200(ha)) | ||
2652 | qla2x00_cancel_io_descriptors(ha); | ||
2653 | |||
2654 | list_for_each_entry(fcport, &ha->fcports, list) { | 2637 | list_for_each_entry(fcport, &ha->fcports, list) { |
2655 | if ((fcport->flags & FCF_FABRIC_DEVICE) == 0 || | 2638 | if ((fcport->flags & FCF_FABRIC_DEVICE) == 0 || |
2656 | (fcport->d_id.b24 & mask) != d_id.b24 || | 2639 | (fcport->d_id.b24 & mask) != d_id.b24 || |