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_os.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_os.c')
-rw-r--r-- | drivers/scsi/qla2xxx/qla_os.c | 31 |
1 files changed, 0 insertions, 31 deletions
diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c index 77e67e1429ee..22e8714a91fd 100644 --- a/drivers/scsi/qla2xxx/qla_os.c +++ b/drivers/scsi/qla2xxx/qla_os.c | |||
@@ -71,12 +71,6 @@ MODULE_PARM_DESC(ql2xfdmienable, | |||
71 | "Enables FDMI registratons " | 71 | "Enables FDMI registratons " |
72 | "Default is 0 - no FDMI. 1 - perfom FDMI."); | 72 | "Default is 0 - no FDMI. 1 - perfom FDMI."); |
73 | 73 | ||
74 | int ql2xprocessrscn; | ||
75 | module_param(ql2xprocessrscn, int, S_IRUGO|S_IRUSR); | ||
76 | MODULE_PARM_DESC(ql2xprocessrscn, | ||
77 | "Option to enable port RSCN handling via a series of less" | ||
78 | "fabric intrusive ADISCs and PLOGIs."); | ||
79 | |||
80 | /* | 74 | /* |
81 | * SCSI host template entry points | 75 | * SCSI host template entry points |
82 | */ | 76 | */ |
@@ -1492,7 +1486,6 @@ int qla2x00_probe_one(struct pci_dev *pdev, struct qla_board_info *brd_info) | |||
1492 | 1486 | ||
1493 | INIT_LIST_HEAD(&ha->list); | 1487 | INIT_LIST_HEAD(&ha->list); |
1494 | INIT_LIST_HEAD(&ha->fcports); | 1488 | INIT_LIST_HEAD(&ha->fcports); |
1495 | INIT_LIST_HEAD(&ha->rscn_fcports); | ||
1496 | 1489 | ||
1497 | /* | 1490 | /* |
1498 | * These locks are used to prevent more than one CPU | 1491 | * These locks are used to prevent more than one CPU |
@@ -1669,10 +1662,6 @@ EXPORT_SYMBOL_GPL(qla2x00_remove_one); | |||
1669 | static void | 1662 | static void |
1670 | qla2x00_free_device(scsi_qla_host_t *ha) | 1663 | qla2x00_free_device(scsi_qla_host_t *ha) |
1671 | { | 1664 | { |
1672 | /* Abort any outstanding IO descriptors. */ | ||
1673 | if (!IS_QLA2100(ha) && !IS_QLA2200(ha)) | ||
1674 | qla2x00_cancel_io_descriptors(ha); | ||
1675 | |||
1676 | /* Disable timer */ | 1665 | /* Disable timer */ |
1677 | if (ha->timer_active) | 1666 | if (ha->timer_active) |
1678 | qla2x00_stop_timer(ha); | 1667 | qla2x00_stop_timer(ha); |
@@ -1909,21 +1898,6 @@ qla2x00_mem_alloc(scsi_qla_host_t *ha) | |||
1909 | } | 1898 | } |
1910 | memset(ha->init_cb, 0, ha->init_cb_size); | 1899 | memset(ha->init_cb, 0, ha->init_cb_size); |
1911 | 1900 | ||
1912 | /* Get consistent memory allocated for Get Port Database cmd */ | ||
1913 | ha->iodesc_pd = dma_pool_alloc(ha->s_dma_pool, GFP_KERNEL, | ||
1914 | &ha->iodesc_pd_dma); | ||
1915 | if (ha->iodesc_pd == NULL) { | ||
1916 | /* error */ | ||
1917 | qla_printk(KERN_WARNING, ha, | ||
1918 | "Memory Allocation failed - iodesc_pd\n"); | ||
1919 | |||
1920 | qla2x00_mem_free(ha); | ||
1921 | msleep(100); | ||
1922 | |||
1923 | continue; | ||
1924 | } | ||
1925 | memset(ha->iodesc_pd, 0, PORT_DATABASE_SIZE); | ||
1926 | |||
1927 | /* Allocate ioctl related memory. */ | 1901 | /* Allocate ioctl related memory. */ |
1928 | if (qla2x00_alloc_ioctl_mem(ha)) { | 1902 | if (qla2x00_alloc_ioctl_mem(ha)) { |
1929 | qla_printk(KERN_WARNING, ha, | 1903 | qla_printk(KERN_WARNING, ha, |
@@ -2048,9 +2022,6 @@ qla2x00_mem_free(scsi_qla_host_t *ha) | |||
2048 | if (ha->ms_iocb) | 2022 | if (ha->ms_iocb) |
2049 | dma_pool_free(ha->s_dma_pool, ha->ms_iocb, ha->ms_iocb_dma); | 2023 | dma_pool_free(ha->s_dma_pool, ha->ms_iocb, ha->ms_iocb_dma); |
2050 | 2024 | ||
2051 | if (ha->iodesc_pd) | ||
2052 | dma_pool_free(ha->s_dma_pool, ha->iodesc_pd, ha->iodesc_pd_dma); | ||
2053 | |||
2054 | if (ha->init_cb) | 2025 | if (ha->init_cb) |
2055 | dma_pool_free(ha->s_dma_pool, ha->init_cb, ha->init_cb_dma); | 2026 | dma_pool_free(ha->s_dma_pool, ha->init_cb, ha->init_cb_dma); |
2056 | 2027 | ||
@@ -2077,8 +2048,6 @@ qla2x00_mem_free(scsi_qla_host_t *ha) | |||
2077 | ha->ct_sns_dma = 0; | 2048 | ha->ct_sns_dma = 0; |
2078 | ha->ms_iocb = NULL; | 2049 | ha->ms_iocb = NULL; |
2079 | ha->ms_iocb_dma = 0; | 2050 | ha->ms_iocb_dma = 0; |
2080 | ha->iodesc_pd = NULL; | ||
2081 | ha->iodesc_pd_dma = 0; | ||
2082 | ha->init_cb = NULL; | 2051 | ha->init_cb = NULL; |
2083 | ha->init_cb_dma = 0; | 2052 | ha->init_cb_dma = 0; |
2084 | 2053 | ||