diff options
Diffstat (limited to 'drivers/scsi/qla2xxx/qla_os.c')
-rw-r--r-- | drivers/scsi/qla2xxx/qla_os.c | 30 |
1 files changed, 3 insertions, 27 deletions
diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c index fbf3b03aba6b..77e67e1429ee 100644 --- a/drivers/scsi/qla2xxx/qla_os.c +++ b/drivers/scsi/qla2xxx/qla_os.c | |||
@@ -340,7 +340,6 @@ qla2x00_get_new_sp(scsi_qla_host_t *ha, fc_port_t *fcport, | |||
340 | if (!sp) | 340 | if (!sp) |
341 | return sp; | 341 | return sp; |
342 | 342 | ||
343 | atomic_set(&sp->ref_count, 1); | ||
344 | sp->ha = ha; | 343 | sp->ha = ha; |
345 | sp->fcport = fcport; | 344 | sp->fcport = fcport; |
346 | sp->cmd = cmd; | 345 | sp->cmd = cmd; |
@@ -634,9 +633,8 @@ qla2xxx_eh_abort(struct scsi_cmnd *cmd) | |||
634 | if (sp->cmd != cmd) | 633 | if (sp->cmd != cmd) |
635 | continue; | 634 | continue; |
636 | 635 | ||
637 | DEBUG2(printk("%s(%ld): aborting sp %p from RISC. pid=%ld " | 636 | DEBUG2(printk("%s(%ld): aborting sp %p from RISC. pid=%ld.\n", |
638 | "sp->state=%x\n", __func__, ha->host_no, sp, serial, | 637 | __func__, ha->host_no, sp, serial)); |
639 | sp->state)); | ||
640 | DEBUG3(qla2x00_print_scsi_cmd(cmd);) | 638 | DEBUG3(qla2x00_print_scsi_cmd(cmd);) |
641 | 639 | ||
642 | spin_unlock_irqrestore(&ha->hardware_lock, flags); | 640 | spin_unlock_irqrestore(&ha->hardware_lock, flags); |
@@ -1377,7 +1375,6 @@ int qla2x00_probe_one(struct pci_dev *pdev, struct qla_board_info *brd_info) | |||
1377 | spin_lock_init(&ha->hardware_lock); | 1375 | spin_lock_init(&ha->hardware_lock); |
1378 | 1376 | ||
1379 | ha->prev_topology = 0; | 1377 | ha->prev_topology = 0; |
1380 | ha->ports = MAX_BUSES; | ||
1381 | ha->init_cb_size = sizeof(init_cb_t); | 1378 | ha->init_cb_size = sizeof(init_cb_t); |
1382 | ha->mgmt_svr_loop_id = MANAGEMENT_SERVER; | 1379 | ha->mgmt_svr_loop_id = MANAGEMENT_SERVER; |
1383 | ha->link_data_rate = LDR_UNKNOWN; | 1380 | ha->link_data_rate = LDR_UNKNOWN; |
@@ -1544,7 +1541,7 @@ int qla2x00_probe_one(struct pci_dev *pdev, struct qla_board_info *brd_info) | |||
1544 | host->cmd_per_lun = 3; | 1541 | host->cmd_per_lun = 3; |
1545 | host->unique_id = ha->instance; | 1542 | host->unique_id = ha->instance; |
1546 | host->max_cmd_len = MAX_CMDSZ; | 1543 | host->max_cmd_len = MAX_CMDSZ; |
1547 | host->max_channel = ha->ports - 1; | 1544 | host->max_channel = MAX_BUSES - 1; |
1548 | host->max_lun = MAX_LUNS; | 1545 | host->max_lun = MAX_LUNS; |
1549 | host->transportt = qla2xxx_transport_template; | 1546 | host->transportt = qla2xxx_transport_template; |
1550 | 1547 | ||
@@ -1885,18 +1882,6 @@ qla2x00_mem_alloc(scsi_qla_host_t *ha) | |||
1885 | continue; | 1882 | continue; |
1886 | } | 1883 | } |
1887 | 1884 | ||
1888 | ha->rlc_rsp = dma_alloc_coherent(&ha->pdev->dev, | ||
1889 | sizeof(rpt_lun_cmd_rsp_t), &ha->rlc_rsp_dma, GFP_KERNEL); | ||
1890 | if (ha->rlc_rsp == NULL) { | ||
1891 | qla_printk(KERN_WARNING, ha, | ||
1892 | "Memory Allocation failed - rlc"); | ||
1893 | |||
1894 | qla2x00_mem_free(ha); | ||
1895 | msleep(100); | ||
1896 | |||
1897 | continue; | ||
1898 | } | ||
1899 | |||
1900 | snprintf(name, sizeof(name), "qla2xxx_%ld", ha->host_no); | 1885 | snprintf(name, sizeof(name), "qla2xxx_%ld", ha->host_no); |
1901 | ha->s_dma_pool = dma_pool_create(name, &ha->pdev->dev, | 1886 | ha->s_dma_pool = dma_pool_create(name, &ha->pdev->dev, |
1902 | DMA_POOL_SIZE, 8, 0); | 1887 | DMA_POOL_SIZE, 8, 0); |
@@ -2072,11 +2057,6 @@ qla2x00_mem_free(scsi_qla_host_t *ha) | |||
2072 | if (ha->s_dma_pool) | 2057 | if (ha->s_dma_pool) |
2073 | dma_pool_destroy(ha->s_dma_pool); | 2058 | dma_pool_destroy(ha->s_dma_pool); |
2074 | 2059 | ||
2075 | if (ha->rlc_rsp) | ||
2076 | dma_free_coherent(&ha->pdev->dev, | ||
2077 | sizeof(rpt_lun_cmd_rsp_t), ha->rlc_rsp, | ||
2078 | ha->rlc_rsp_dma); | ||
2079 | |||
2080 | if (ha->gid_list) | 2060 | if (ha->gid_list) |
2081 | dma_free_coherent(&ha->pdev->dev, GID_LIST_SIZE, ha->gid_list, | 2061 | dma_free_coherent(&ha->pdev->dev, GID_LIST_SIZE, ha->gid_list, |
2082 | ha->gid_list_dma); | 2062 | ha->gid_list_dma); |
@@ -2104,8 +2084,6 @@ qla2x00_mem_free(scsi_qla_host_t *ha) | |||
2104 | 2084 | ||
2105 | ha->s_dma_pool = NULL; | 2085 | ha->s_dma_pool = NULL; |
2106 | 2086 | ||
2107 | ha->rlc_rsp = NULL; | ||
2108 | ha->rlc_rsp_dma = 0; | ||
2109 | ha->gid_list = NULL; | 2087 | ha->gid_list = NULL; |
2110 | ha->gid_list_dma = 0; | 2088 | ha->gid_list_dma = 0; |
2111 | 2089 | ||
@@ -2149,8 +2127,6 @@ qla2x00_mem_free(scsi_qla_host_t *ha) | |||
2149 | * | 2127 | * |
2150 | * Context: | 2128 | * Context: |
2151 | * Kernel context. | 2129 | * Kernel context. |
2152 | * | ||
2153 | * Note: Sets the ref_count for non Null sp to one. | ||
2154 | */ | 2130 | */ |
2155 | static int | 2131 | static int |
2156 | qla2x00_allocate_sp_pool(scsi_qla_host_t *ha) | 2132 | qla2x00_allocate_sp_pool(scsi_qla_host_t *ha) |