Skip to content

Commit 75bc419

Browse files
avasquez01James Bottomley
avasquez01
authored and
James Bottomley
committed
[SCSI] qla2xxx: Drop unused driver cruft.
- structure definitions. - structure members. - #define's. Signed-off-by: Andrew Vasquez <andrew.vasquez@qlogic.com> Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
1 parent 5341e86 commit 75bc419

File tree

9 files changed

+5
-170
lines changed

9 files changed

+5
-170
lines changed

‎drivers/scsi/qla2xxx/qla_dbg.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1995,7 +1995,6 @@ qla2x00_print_scsi_cmd(struct scsi_cmnd * cmd)
19951995
return;
19961996

19971997
printk(" sp flags=0x%x\n", sp->flags);
1998-
printk(" state=%d\n", sp->state);
19991998
}
20001999

20012000
void

‎drivers/scsi/qla2xxx/qla_def.h

Lines changed: 0 additions & 116 deletions
Original file line numberDiff line numberDiff line change
@@ -189,22 +189,13 @@ typedef struct srb {
189189

190190
struct scsi_cmnd *cmd; /* Linux SCSI command pkt */
191191

192-
struct timer_list timer; /* Command timer */
193-
atomic_t ref_count; /* Reference count for this structure */
194192
uint16_t flags;
195193

196-
/* Request state */
197-
uint16_t state;
198-
199194
/* Single transfer DMA context */
200195
dma_addr_t dma_handle;
201196

202197
uint32_t request_sense_length;
203198
uint8_t *request_sense_ptr;
204-
205-
/* SRB magic number */
206-
uint16_t magic;
207-
#define SRB_MAGIC 0x10CB
208199
} srb_t;
209200

210201
/*
@@ -225,21 +216,6 @@ typedef struct srb {
225216
#define SRB_IOCTL BIT_10 /* IOCTL command. */
226217
#define SRB_TAPE BIT_11 /* FCP2 (Tape) command. */
227218

228-
/*
229-
* SRB state definitions
230-
*/
231-
#define SRB_FREE_STATE 0 /* returned back */
232-
#define SRB_PENDING_STATE 1 /* queued in LUN Q */
233-
#define SRB_ACTIVE_STATE 2 /* in Active Array */
234-
#define SRB_DONE_STATE 3 /* queued in Done Queue */
235-
#define SRB_RETRY_STATE 4 /* in Retry Queue */
236-
#define SRB_SUSPENDED_STATE 5 /* in suspended state */
237-
#define SRB_NO_QUEUE_STATE 6 /* is in between states */
238-
#define SRB_ACTIVE_TIMEOUT_STATE 7 /* in Active Array but timed out */
239-
#define SRB_FAILOVER_STATE 8 /* in Failover Queue */
240-
#define SRB_SCSI_RETRY_STATE 9 /* in Scsi Retry Queue */
241-
242-
243219
/*
244220
* ISP I/O Register Set structure definitions.
245221
*/
@@ -1515,62 +1491,6 @@ typedef struct {
15151491
uint8_t port_name[WWN_SIZE];
15161492
} sw_info_t;
15171493

1518-
/*
1519-
* Inquiry command structure.
1520-
*/
1521-
#define INQ_DATA_SIZE 36
1522-
1523-
/*
1524-
* Inquiry mailbox IOCB packet definition.
1525-
*/
1526-
typedef struct {
1527-
union {
1528-
cmd_a64_entry_t cmd;
1529-
sts_entry_t rsp;
1530-
struct cmd_type_7 cmd24;
1531-
struct sts_entry_24xx rsp24;
1532-
} p;
1533-
uint8_t inq[INQ_DATA_SIZE];
1534-
} inq_cmd_rsp_t;
1535-
1536-
/*
1537-
* Report LUN command structure.
1538-
*/
1539-
#define CHAR_TO_SHORT(a, b) (uint16_t)((uint8_t)b << 8 | (uint8_t)a)
1540-
1541-
typedef struct {
1542-
uint32_t len;
1543-
uint32_t rsrv;
1544-
} rpt_hdr_t;
1545-
1546-
typedef struct {
1547-
struct {
1548-
uint8_t b : 6;
1549-
uint8_t address_method : 2;
1550-
} msb;
1551-
uint8_t lsb;
1552-
uint8_t unused[6];
1553-
} rpt_lun_t;
1554-
1555-
typedef struct {
1556-
rpt_hdr_t hdr;
1557-
rpt_lun_t lst[MAX_LUNS];
1558-
} rpt_lun_lst_t;
1559-
1560-
/*
1561-
* Report Lun mailbox IOCB packet definition.
1562-
*/
1563-
typedef struct {
1564-
union {
1565-
cmd_a64_entry_t cmd;
1566-
sts_entry_t rsp;
1567-
struct cmd_type_7 cmd24;
1568-
struct sts_entry_24xx rsp24;
1569-
} p;
1570-
rpt_lun_lst_t list;
1571-
} rpt_lun_cmd_rsp_t;
1572-
1573-
15741494
/*
15751495
* Fibre channel port type.
15761496
*/
@@ -1589,7 +1509,6 @@ typedef struct {
15891509
typedef struct fc_port {
15901510
struct list_head list;
15911511
struct scsi_qla_host *ha;
1592-
struct scsi_qla_host *vis_ha; /* only used when suspending lun */
15931512

15941513
uint8_t node_name[WWN_SIZE];
15951514
uint8_t port_name[WWN_SIZE];
@@ -1610,17 +1529,9 @@ typedef struct fc_port {
16101529
int login_retry;
16111530
atomic_t port_down_timer;
16121531

1613-
uint8_t device_type;
1614-
uint8_t unused;
1615-
1616-
uint8_t mp_byte; /* multi-path byte (not used) */
1617-
uint8_t cur_path; /* current path id */
1618-
16191532
spinlock_t rport_lock;
16201533
struct fc_rport *rport, *drport;
16211534
u32 supported_classes;
1622-
struct work_struct rport_add_work;
1623-
struct work_struct rport_del_work;
16241535
} fc_port_t;
16251536

16261537
/*
@@ -2305,9 +2216,6 @@ typedef struct scsi_qla_host {
23052216
uint32_t current_outstanding_cmd;
23062217
srb_t *status_srb; /* Status continuation entry. */
23072218

2308-
uint16_t revision;
2309-
uint8_t ports;
2310-
23112219
/* ISP configuration data. */
23122220
uint16_t loop_id; /* Host adapter loop id */
23132221
uint16_t fb_rev;
@@ -2397,9 +2305,6 @@ typedef struct scsi_qla_host {
23972305
struct gid_list_info *gid_list;
23982306
int gid_list_info_size;
23992307

2400-
dma_addr_t rlc_rsp_dma;
2401-
rpt_lun_cmd_rsp_t *rlc_rsp;
2402-
24032308
/* Small DMA pool allocations -- maximum 256 bytes in length. */
24042309
#define DMA_POOL_SIZE 256
24052310
struct dma_pool *s_dma_pool;
@@ -2505,8 +2410,6 @@ typedef struct scsi_qla_host {
25052410
test_bit(LOOP_RESYNC_NEEDED, &ha->dpc_flags) || \
25062411
atomic_read(&ha->loop_state) == LOOP_DOWN)
25072412

2508-
#define TGT_Q(ha, t) (ha->otgt[t])
2509-
25102413
#define to_qla_host(x) ((scsi_qla_host_t *) (x)->hostdata)
25112414

25122415
#define qla_printk(level, ha, format, arg...) \
@@ -2539,19 +2442,6 @@ typedef struct scsi_qla_host {
25392442
#define QLA_RSCNS_HANDLED 0x108
25402443
#define QLA_ALREADY_REGISTERED 0x109
25412444

2542-
/*
2543-
* Stat info for all adpaters
2544-
*/
2545-
struct _qla2x00stats {
2546-
unsigned long mboxtout; /* mailbox timeouts */
2547-
unsigned long mboxerr; /* mailbox errors */
2548-
unsigned long ispAbort; /* ISP aborts */
2549-
unsigned long debugNo;
2550-
unsigned long loop_resync;
2551-
unsigned long outarray_full;
2552-
unsigned long retry_q_cnt;
2553-
};
2554-
25552445
#define NVRAM_DELAY() udelay(10)
25562446

25572447
#define INVALID_HANDLE (MAX_OUTSTANDING_COMMANDS+1)
@@ -2567,12 +2457,6 @@ struct _qla2x00stats {
25672457
#include "qla_dbg.h"
25682458
#include "qla_inline.h"
25692459

2570-
/*
2571-
* String arrays
2572-
*/
2573-
#define LINESIZE 256
2574-
#define MAXARGS 26
2575-
25762460
#define CMD_SP(Cmnd) ((Cmnd)->SCp.ptr)
25772461
#define CMD_COMPL_STATUS(Cmnd) ((Cmnd)->SCp.this_residual)
25782462
#define CMD_RESID_LEN(Cmnd) ((Cmnd)->SCp.buffers_residual)

‎drivers/scsi/qla2xxx/qla_gbl.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,8 +70,6 @@ extern void qla2x00_sp_compl(scsi_qla_host_t *, srb_t *);
7070

7171
extern char *qla2x00_get_fw_version_str(struct scsi_qla_host *, char *);
7272

73-
extern void qla2x00_cmd_timeout(srb_t *);
74-
7573
extern void qla2x00_mark_device_lost(scsi_qla_host_t *, fc_port_t *, int, int);
7674
extern void qla2x00_mark_all_devices_lost(scsi_qla_host_t *, int);
7775

‎drivers/scsi/qla2xxx/qla_init.c

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,6 @@ qla2100_pci_config(scsi_qla_host_t *ha)
194194
mwi = 0;
195195
if (pci_set_mwi(ha->pdev))
196196
mwi = PCI_COMMAND_INVALIDATE;
197-
pci_read_config_word(ha->pdev, PCI_REVISION_ID, &ha->revision);
198197

199198
pci_read_config_word(ha->pdev, PCI_COMMAND, &w);
200199
w |= mwi | (PCI_COMMAND_PARITY | PCI_COMMAND_SERR);
@@ -232,7 +231,6 @@ qla2300_pci_config(scsi_qla_host_t *ha)
232231
mwi = 0;
233232
if (pci_set_mwi(ha->pdev))
234233
mwi = PCI_COMMAND_INVALIDATE;
235-
pci_read_config_word(ha->pdev, PCI_REVISION_ID, &ha->revision);
236234

237235
pci_read_config_word(ha->pdev, PCI_COMMAND, &w);
238236
w |= mwi | (PCI_COMMAND_PARITY | PCI_COMMAND_SERR);
@@ -320,7 +318,6 @@ qla24xx_pci_config(scsi_qla_host_t *ha)
320318
mwi = 0;
321319
if (pci_set_mwi(ha->pdev))
322320
mwi = PCI_COMMAND_INVALIDATE;
323-
pci_read_config_word(ha->pdev, PCI_REVISION_ID, &ha->revision);
324321

325322
pci_read_config_word(ha->pdev, PCI_COMMAND, &w);
326323
w |= mwi | (PCI_COMMAND_PARITY | PCI_COMMAND_SERR);
@@ -1674,14 +1671,6 @@ qla2x00_nvram_config(scsi_qla_host_t *ha)
16741671
return (rval);
16751672
}
16761673

1677-
static void
1678-
qla2x00_rport_add(void *data)
1679-
{
1680-
fc_port_t *fcport = data;
1681-
1682-
qla2x00_reg_remote_port(fcport->ha, fcport);
1683-
}
1684-
16851674
static void
16861675
qla2x00_rport_del(void *data)
16871676
{
@@ -1724,8 +1713,6 @@ qla2x00_alloc_fcport(scsi_qla_host_t *ha, gfp_t flags)
17241713
fcport->flags = FCF_RLC_SUPPORT;
17251714
fcport->supported_classes = FC_COS_UNSPECIFIED;
17261715
spin_lock_init(&fcport->rport_lock);
1727-
INIT_WORK(&fcport->rport_add_work, qla2x00_rport_add, fcport);
1728-
INIT_WORK(&fcport->rport_del_work, qla2x00_rport_del, fcport);
17291716

17301717
return (fcport);
17311718
}
@@ -2048,10 +2035,6 @@ qla2x00_update_fcport(scsi_qla_host_t *ha, fc_port_t *fcport)
20482035
PORT_RETRY_TIME);
20492036
fcport->flags &= ~FCF_LOGIN_NEEDED;
20502037

2051-
if (fcport->port_type == FCT_INITIATOR ||
2052-
fcport->port_type == FCT_BROADCAST)
2053-
fcport->device_type = TYPE_PROCESSOR;
2054-
20552038
atomic_set(&fcport->state, FCS_ONLINE);
20562039

20572040
if (ha->flags.init_done)

‎drivers/scsi/qla2xxx/qla_iocb.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -408,7 +408,6 @@ qla2x00_start_scsi(srb_t *sp)
408408
ha->request_ring_ptr++;
409409

410410
sp->flags |= SRB_DMA_VALID;
411-
sp->state = SRB_ACTIVE_STATE;
412411

413412
/* Set chip new ring index. */
414413
WRT_REG_WORD(ISP_REQ_Q_IN(ha, reg), ha->req_ring_index);
@@ -838,7 +837,6 @@ qla24xx_start_scsi(srb_t *sp)
838837
ha->request_ring_ptr++;
839838

840839
sp->flags |= SRB_DMA_VALID;
841-
sp->state = SRB_ACTIVE_STATE;
842840

843841
/* Set chip new ring index. */
844842
WRT_REG_DWORD(&reg->req_q_in, ha->req_ring_index);

‎drivers/scsi/qla2xxx/qla_isr.c

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -844,8 +844,7 @@ qla2x00_status_entry(scsi_qla_host_t *ha, void *pkt)
844844
cp = sp->cmd;
845845
if (cp == NULL) {
846846
DEBUG2(printk("scsi(%ld): Command already returned back to OS "
847-
"pkt->handle=%d sp=%p sp->state:%d\n",
848-
ha->host_no, sts->handle, sp, sp->state));
847+
"pkt->handle=%d sp=%p.\n", ha->host_no, sts->handle, sp));
849848
qla_printk(KERN_WARNING, ha,
850849
"Command is NULL: already returned to OS (sp=%p)\n", sp);
851850

@@ -1189,7 +1188,7 @@ qla2x00_status_cont_entry(scsi_qla_host_t *ha, sts_cont_entry_t *pkt)
11891188
cp = sp->cmd;
11901189
if (cp == NULL) {
11911190
DEBUG2(printk("%s(): Cmd already returned back to OS "
1192-
"sp=%p sp->state:%d\n", __func__, sp, sp->state));
1191+
"sp=%p.\n", __func__, sp));
11931192
qla_printk(KERN_INFO, ha,
11941193
"cmd is NULL: already returned to OS (sp=%p)\n",
11951194
sp);

‎drivers/scsi/qla2xxx/qla_os.c

Lines changed: 3 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -340,7 +340,6 @@ qla2x00_get_new_sp(scsi_qla_host_t *ha, fc_port_t *fcport,
340340
if (!sp)
341341
return sp;
342342

343-
atomic_set(&sp->ref_count, 1);
344343
sp->ha = ha;
345344
sp->fcport = fcport;
346345
sp->cmd = cmd;
@@ -634,9 +633,8 @@ qla2xxx_eh_abort(struct scsi_cmnd *cmd)
634633
if (sp->cmd != cmd)
635634
continue;
636635

637-
DEBUG2(printk("%s(%ld): aborting sp %p from RISC. pid=%ld "
638-
"sp->state=%x\n", __func__, ha->host_no, sp, serial,
639-
sp->state));
636+
DEBUG2(printk("%s(%ld): aborting sp %p from RISC. pid=%ld.\n",
637+
__func__, ha->host_no, sp, serial));
640638
DEBUG3(qla2x00_print_scsi_cmd(cmd);)
641639

642640
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)
13771375
spin_lock_init(&ha->hardware_lock);
13781376

13791377
ha->prev_topology = 0;
1380-
ha->ports = MAX_BUSES;
13811378
ha->init_cb_size = sizeof(init_cb_t);
13821379
ha->mgmt_svr_loop_id = MANAGEMENT_SERVER;
13831380
ha->link_data_rate = LDR_UNKNOWN;
@@ -1544,7 +1541,7 @@ int qla2x00_probe_one(struct pci_dev *pdev, struct qla_board_info *brd_info)
15441541
host->cmd_per_lun = 3;
15451542
host->unique_id = ha->instance;
15461543
host->max_cmd_len = MAX_CMDSZ;
1547-
host->max_channel = ha->ports - 1;
1544+
host->max_channel = MAX_BUSES - 1;
15481545
host->max_lun = MAX_LUNS;
15491546
host->transportt = qla2xxx_transport_template;
15501547

@@ -1885,18 +1882,6 @@ qla2x00_mem_alloc(scsi_qla_host_t *ha)
18851882
continue;
18861883
}
18871884

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-
19001885
snprintf(name, sizeof(name), "qla2xxx_%ld", ha->host_no);
19011886
ha->s_dma_pool = dma_pool_create(name, &ha->pdev->dev,
19021887
DMA_POOL_SIZE, 8, 0);
@@ -2072,11 +2057,6 @@ qla2x00_mem_free(scsi_qla_host_t *ha)
20722057
if (ha->s_dma_pool)
20732058
dma_pool_destroy(ha->s_dma_pool);
20742059

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-
20802060
if (ha->gid_list)
20812061
dma_free_coherent(&ha->pdev->dev, GID_LIST_SIZE, ha->gid_list,
20822062
ha->gid_list_dma);
@@ -2104,8 +2084,6 @@ qla2x00_mem_free(scsi_qla_host_t *ha)
21042084

21052085
ha->s_dma_pool = NULL;
21062086

2107-
ha->rlc_rsp = NULL;
2108-
ha->rlc_rsp_dma = 0;
21092087
ha->gid_list = NULL;
21102088
ha->gid_list_dma = 0;
21112089

@@ -2149,8 +2127,6 @@ qla2x00_mem_free(scsi_qla_host_t *ha)
21492127
*
21502128
* Context:
21512129
* Kernel context.
2152-
*
2153-
* Note: Sets the ref_count for non Null sp to one.
21542130
*/
21552131
static int
21562132
qla2x00_allocate_sp_pool(scsi_qla_host_t *ha)

0 commit comments

Comments
 (0)