[SCSI] bfa: remove inactive functions

This patch removes some inactive functions and macros. Signed-off-by: Jing Huang <huangj@brocade.com> Signed-off-by: James Bottomley <James.Bottomley@suse.de>

[SCSI] bfa: remove inactive functions
This patch removes some inactive functions and macros. Signed-off-by: Jing Huang <huangj@brocade.com> Signed-off-by: James Bottomley <James.Bottomley@suse.de>
Jing Huang · James Bottomley
1 parent d4b671c58e
Showing 7 changed files with 0 additions and 74 deletions Side-by-side Diff
drivers/scsi/bfa/Makefile
drivers/scsi/bfa/bfa_core.c
drivers/scsi/bfa/bfa_cs.h
drivers/scsi/bfa/bfa_fcpim.c
drivers/scsi/bfa/bfa_svc.c
drivers/scsi/bfa/bfad.c
drivers/scsi/bfa/bfad_im.c
@@ -4,6 +4,4 @@
 bfa-y += bfa_ioc.o bfa_ioc_cb.o bfa_ioc_ct.o bfa_hw_cb.o bfa_hw_ct.o
 bfa-y += bfa_fcs.o bfa_fcs_lport.o bfa_fcs_rport.o bfa_fcs_fcpim.o bfa_fcbuild.o
 bfa-y += bfa_port.o bfa_fcpim.o bfa_core.o bfa_svc.o
-
-ccflags-y := -DBFA_PERF_BUILD
@@ -296,8 +296,6 @@
 	u32 pi, ci;
 	struct list_head *waitq;
  
-	bfa_trc_fp(bfa, qid);
-
 	qid &= (BFI_IOC_MAX_CQS - 1);
  
 	bfa->iocfc.hwif.hw_rspq_ack(bfa, qid);
  
  
@@ -305,16 +303,10 @@
 	ci = bfa_rspq_ci(bfa, qid);
 	pi = bfa_rspq_pi(bfa, qid);
  
-	bfa_trc_fp(bfa, ci);
-	bfa_trc_fp(bfa, pi);
-
 	if (bfa->rme_process) {
 		while (ci != pi) {
 			m = bfa_rspq_elem(bfa, qid, ci);
-			bfa_assert_fp(m->mhdr.msg_class < BFI_MC_MAX);
-
 			bfa_isrs[m->mhdr.msg_class] (bfa, m);
-
 			CQ_INCR(ci, bfa->iocfc.cfg.drvcfg.num_rspq_elems);
 		}
 	}
@@ -107,13 +107,6 @@
 	trcm->stopped = 1;
 }
  
-#ifdef FWTRC
-extern void dc_flush(void *data);
-#else
-#define dc_flush(data)
-#endif
-
-
 static inline void
 __bfa_trc(struct bfa_trc_mod_s *trcm, int fileno, int line, u64 data)
 {
  
@@ -127,12 +120,10 @@
 	trc->line = (u16) line;
 	trc->data.u64 = data;
 	trc->timestamp = BFA_TRC_TS(trcm);
-	dc_flush(trc);
  
 	trcm->tail = (trcm->tail + 1) & (BFA_TRC_MAX - 1);
 	if (trcm->tail == trcm->head)
 		trcm->head = (trcm->head + 1) & (BFA_TRC_MAX - 1);
-	dc_flush(trcm);
 }
  
  
  
  
  
@@ -149,32 +140,18 @@
 	trc->line = (u16) line;
 	trc->data.u32.u32 = data;
 	trc->timestamp = BFA_TRC_TS(trcm);
-	dc_flush(trc);
  
 	trcm->tail = (trcm->tail + 1) & (BFA_TRC_MAX - 1);
 	if (trcm->tail == trcm->head)
 		trcm->head = (trcm->head + 1) & (BFA_TRC_MAX - 1);
-	dc_flush(trcm);
 }
  
-#ifndef BFA_PERF_BUILD
-#define bfa_trc_fp(_trcp, _data)	bfa_trc(_trcp, _data)
-#else
-#define bfa_trc_fp(_trcp, _data)
-#endif
-
 #define bfa_sm_fault(__mod, __event)	do {				\
 	bfa_trc(__mod, (((u32)0xDEAD << 16) | __event));		\
 	printk(KERN_ERR	"Assertion failure: %s:%d: %d",			\
 		__FILE__, __LINE__, (__event));				\
 } while (0)
  
-#ifndef BFA_PERF_BUILD
-#define bfa_assert_fp(__cond)	bfa_assert(__cond)
-#else
-#define bfa_assert_fp(__cond)
-#endif
-
 /* BFA queue definitions */
 #define bfa_q_first(_q) ((void *)(((struct list_head *) (_q))->next))
 #define bfa_q_next(_qe) (((struct list_head *) (_qe))->next)
@@ -197,7 +174,6 @@
 		bfa_q_prev(bfa_q_next(*((struct list_head **) _qe))) =	\
 				(struct list_head *) (_q);		\
 		bfa_q_next(_q) = bfa_q_next(*((struct list_head **) _qe));\
-		BFA_Q_DBG_INIT(*((struct list_head **) _qe));		\
 	} else {							\
 		*((struct list_head **) (_qe)) = (struct list_head *) NULL;\
 	}								\
@@ -212,7 +188,6 @@
 		bfa_q_next(bfa_q_prev(*((struct list_head **) _qe))) =	\
 			(struct list_head *) (_q);			\
 		bfa_q_prev(_q) = bfa_q_prev(*(struct list_head **) _qe);\
-		BFA_Q_DBG_INIT(*((struct list_head **) _qe));		\
 	} else {							\
 		*((struct list_head **) (_qe)) = (struct list_head *) NULL;\
 	}								\
@@ -233,16 +208,6 @@
 	}
 	return 0;
 }
-
-/*
- * #ifdef BFA_DEBUG (Using bfa_assert to check for debug_build is not
- * consistent across modules)
- */
-#ifndef BFA_PERF_BUILD
-#define BFA_Q_DBG_INIT(_qe) bfa_q_qe_init(_qe)
-#else
-#define BFA_Q_DBG_INIT(_qe)
-#endif
  
 #define bfa_q_is_on_q(_q, _qe)      \
 	bfa_q_is_on_q_func(_q, (struct list_head *)(_qe))
@@ -1367,9 +1367,6 @@
 static void
 bfa_ioim_sm_uninit(struct bfa_ioim_s *ioim, enum bfa_ioim_event event)
 {
-	bfa_trc_fp(ioim->bfa, ioim->iotag);
-	bfa_trc_fp(ioim->bfa, event);
-
 	switch (event) {
 	case BFA_IOIM_SM_START:
 		if (!bfa_itnim_is_online(ioim->itnim)) {
@@ -1479,9 +1476,6 @@
 static void
 bfa_ioim_sm_active(struct bfa_ioim_s *ioim, enum bfa_ioim_event event)
 {
-	bfa_trc_fp(ioim->bfa, ioim->iotag);
-	bfa_trc_fp(ioim->bfa, event);
-
 	switch (event) {
 	case BFA_IOIM_SM_COMP_GOOD:
 		bfa_sm_set_state(ioim, bfa_ioim_sm_hcb);
@@ -1563,9 +1557,6 @@
 static void
 bfa_ioim_sm_cmnd_retry(struct bfa_ioim_s *ioim, enum bfa_ioim_event event)
 {
-	bfa_trc_fp(ioim->bfa, ioim->iotag);
-	bfa_trc_fp(ioim->bfa, event);
-
 	switch (event) {
 	case BFA_IOIM_SM_FREE:
 		/* abts and rrq done. Now retry the IO with new tag */
@@ -1886,9 +1877,6 @@
 static void
 bfa_ioim_sm_hcb(struct bfa_ioim_s *ioim, enum bfa_ioim_event event)
 {
-	bfa_trc_fp(ioim->bfa, ioim->iotag);
-	bfa_trc_fp(ioim->bfa, event);
-
 	switch (event) {
 	case BFA_IOIM_SM_HCB:
 		bfa_sm_set_state(ioim, bfa_ioim_sm_uninit);
  
@@ -2529,9 +2517,7 @@
 	ioim = BFA_IOIM_FROM_TAG(fcpim, iotag);
 	WARN_ON(BFA_IOIM_TAG_2_ID(ioim->iotag) != iotag);
  
-	bfa_trc_fp(ioim->bfa, ioim->iotag);
 	bfa_ioim_cb_profile_comp(fcpim, ioim);
-
 	bfa_sm_send_event(ioim, BFA_IOIM_SM_COMP_GOOD);
 }
  
@@ -2608,7 +2594,6 @@
 	fcpim->ios_active++;
  
 	list_add_tail(&ioim->qe, &itnim->io_q);
-	bfa_trc_fp(ioim->bfa, ioim->iotag);
  
 	return ioim;
 }
@@ -2618,12 +2603,6 @@
 {
 	struct bfa_fcpim_mod_s *fcpim = ioim->fcpim;
  
-	bfa_trc_fp(ioim->bfa, ioim->iotag);
-	bfa_assert_fp(bfa_sm_cmp_state(ioim, bfa_ioim_sm_uninit));
-
-	bfa_assert_fp(list_empty(&ioim->sgpg_q) ||
-			(ioim->nsges > BFI_SGE_INLINE));
-
 	if (ioim->nsgpgs > 0)
 		bfa_sgpg_mfree(ioim->bfa, &ioim->sgpg_q, ioim->nsgpgs);
  
@@ -2638,8 +2617,6 @@
 void
 bfa_ioim_start(struct bfa_ioim_s *ioim)
 {
-	bfa_trc_fp(ioim->bfa, ioim->iotag);
-
 	bfa_ioim_cb_profile_start(ioim->fcpim, ioim);
  
 	/*
@@ -4670,8 +4670,6 @@
 	struct bfa_sgpg_s *hsgpg;
 	int i;
  
-	bfa_trc_fp(bfa, nsgpgs);
-
 	if (mod->free_sgpgs < nsgpgs)
 		return BFA_STATUS_ENOMEM;
  
@@ -4690,8 +4688,6 @@
 {
 	struct bfa_sgpg_mod_s *mod = BFA_SGPG_MOD(bfa);
 	struct bfa_sgpg_wqe_s *wqe;
-
-	bfa_trc_fp(bfa, nsgpg);
  
 	mod->free_sgpgs += nsgpg;
 	WARN_ON(mod->free_sgpgs > mod->num_sgpgs);
@@ -1166,7 +1166,6 @@
 		spin_lock_irqsave(&bfad->bfad_lock, flags);
 		bfa_comp_free(&bfad->bfa, &doneq);
 		spin_unlock_irqrestore(&bfad->bfad_lock, flags);
-		bfa_trc_fp(bfad, irq);
 	}
  
 	return IRQ_HANDLED;
@@ -1174,7 +1174,6 @@
 	}
  
 	cmnd->host_scribble = (char *)hal_io;
-	bfa_trc_fp(bfad, hal_io->iotag);
 	bfa_ioim_start(hal_io);
 	spin_unlock_irqrestore(&bfad->bfad_lock, flags);
...	...	@@ -4,6 +4,4 @@
4	4	bfa-y += bfa_ioc.o bfa_ioc_cb.o bfa_ioc_ct.o bfa_hw_cb.o bfa_hw_ct.o
5	5	bfa-y += bfa_fcs.o bfa_fcs_lport.o bfa_fcs_rport.o bfa_fcs_fcpim.o bfa_fcbuild.o
6	6	bfa-y += bfa_port.o bfa_fcpim.o bfa_core.o bfa_svc.o
7		-
8		-ccflags-y := -DBFA_PERF_BUILD
...	...	@@ -296,8 +296,6 @@
296	296	u32 pi, ci;
297	297	struct list_head *waitq;
298	298
299		- bfa_trc_fp(bfa, qid);
300		-
301	299	qid &= (BFI_IOC_MAX_CQS - 1);
302	300
303	301	bfa->iocfc.hwif.hw_rspq_ack(bfa, qid);
304	302
305	303
...	...	@@ -305,16 +303,10 @@
305	303	ci = bfa_rspq_ci(bfa, qid);
306	304	pi = bfa_rspq_pi(bfa, qid);
307	305
308		- bfa_trc_fp(bfa, ci);
309		- bfa_trc_fp(bfa, pi);
310		-
311	306	if (bfa->rme_process) {
312	307	while (ci != pi) {
313	308	m = bfa_rspq_elem(bfa, qid, ci);
314		- bfa_assert_fp(m->mhdr.msg_class < BFI_MC_MAX);
315		-
316	309	bfa_isrs[m->mhdr.msg_class] (bfa, m);
317		-
318	310	CQ_INCR(ci, bfa->iocfc.cfg.drvcfg.num_rspq_elems);
319	311	}
320	312	}
...	...	@@ -107,13 +107,6 @@
107	107	trcm->stopped = 1;
108	108	}
109	109
110		-#ifdef FWTRC
111		-extern void dc_flush(void *data);
112		-#else
113		-#define dc_flush(data)
114		-#endif
115		-
116		-
117	110	static inline void
118	111	__bfa_trc(struct bfa_trc_mod_s *trcm, int fileno, int line, u64 data)
119	112	{
120	113
...	...	@@ -127,12 +120,10 @@
127	120	trc->line = (u16) line;
128	121	trc->data.u64 = data;
129	122	trc->timestamp = BFA_TRC_TS(trcm);
130		- dc_flush(trc);
131	123
132	124	trcm->tail = (trcm->tail + 1) & (BFA_TRC_MAX - 1);
133	125	if (trcm->tail == trcm->head)
134	126	trcm->head = (trcm->head + 1) & (BFA_TRC_MAX - 1);
135		- dc_flush(trcm);
136	127	}
137	128
138	129
139	130
140	131
141	132
...	...	@@ -149,32 +140,18 @@
149	140	trc->line = (u16) line;
150	141	trc->data.u32.u32 = data;
151	142	trc->timestamp = BFA_TRC_TS(trcm);
152		- dc_flush(trc);
153	143
154	144	trcm->tail = (trcm->tail + 1) & (BFA_TRC_MAX - 1);
155	145	if (trcm->tail == trcm->head)
156	146	trcm->head = (trcm->head + 1) & (BFA_TRC_MAX - 1);
157		- dc_flush(trcm);
158	147	}
159	148
160		-#ifndef BFA_PERF_BUILD
161		-#define bfa_trc_fp(_trcp, _data) bfa_trc(_trcp, _data)
162		-#else
163		-#define bfa_trc_fp(_trcp, _data)
164		-#endif
165		-
166	149	#define bfa_sm_fault(__mod, __event) do { \
167	150	bfa_trc(__mod, (((u32)0xDEAD << 16) \| __event)); \
168	151	printk(KERN_ERR "Assertion failure: %s:%d: %d", \
169	152	__FILE__, __LINE__, (__event)); \
170	153	} while (0)
171	154
172		-#ifndef BFA_PERF_BUILD
173		-#define bfa_assert_fp(__cond) bfa_assert(__cond)
174		-#else
175		-#define bfa_assert_fp(__cond)
176		-#endif
177		-
178	155	/* BFA queue definitions */
179	156	#define bfa_q_first(_q) ((void )(((struct list_head ) (_q))->next))
180	157	#define bfa_q_next(_qe) (((struct list_head *) (_qe))->next)
...	...	@@ -197,7 +174,6 @@
197	174	bfa_q_prev(bfa_q_next(((struct list_head *) _qe))) = \
198	175	(struct list_head *) (_q); \
199	176	bfa_q_next(_q) = bfa_q_next(((struct list_head *) _qe));\
200		- BFA_Q_DBG_INIT(((struct list_head *) _qe)); \
201	177	} else { \
202	178	((struct list_head ) (_qe)) = (struct list_head ) NULL;\
203	179	} \
...	...	@@ -212,7 +188,6 @@
212	188	bfa_q_next(bfa_q_prev(((struct list_head *) _qe))) = \
213	189	(struct list_head *) (_q); \
214	190	bfa_q_prev(_q) = bfa_q_prev((struct list_head *) _qe);\
215		- BFA_Q_DBG_INIT(((struct list_head *) _qe)); \
216	191	} else { \
217	192	((struct list_head ) (_qe)) = (struct list_head ) NULL;\
218	193	} \
...	...	@@ -233,16 +208,6 @@
233	208	}
234	209	return 0;
235	210	}
236		-
237		-/*
238		- * #ifdef BFA_DEBUG (Using bfa_assert to check for debug_build is not
239		- * consistent across modules)
240		- */
241		-#ifndef BFA_PERF_BUILD
242		-#define BFA_Q_DBG_INIT(_qe) bfa_q_qe_init(_qe)
243		-#else
244		-#define BFA_Q_DBG_INIT(_qe)
245		-#endif
246	211
247	212	#define bfa_q_is_on_q(_q, _qe) \
248	213	bfa_q_is_on_q_func(_q, (struct list_head *)(_qe))
...	...	@@ -1367,9 +1367,6 @@
1367	1367	static void
1368	1368	bfa_ioim_sm_uninit(struct bfa_ioim_s *ioim, enum bfa_ioim_event event)
1369	1369	{
1370		- bfa_trc_fp(ioim->bfa, ioim->iotag);
1371		- bfa_trc_fp(ioim->bfa, event);
1372		-
1373	1370	switch (event) {
1374	1371	case BFA_IOIM_SM_START:
1375	1372	if (!bfa_itnim_is_online(ioim->itnim)) {
...	...	@@ -1479,9 +1476,6 @@
1479	1476	static void
1480	1477	bfa_ioim_sm_active(struct bfa_ioim_s *ioim, enum bfa_ioim_event event)
1481	1478	{
1482		- bfa_trc_fp(ioim->bfa, ioim->iotag);
1483		- bfa_trc_fp(ioim->bfa, event);
1484		-
1485	1479	switch (event) {
1486	1480	case BFA_IOIM_SM_COMP_GOOD:
1487	1481	bfa_sm_set_state(ioim, bfa_ioim_sm_hcb);
...	...	@@ -1563,9 +1557,6 @@
1563	1557	static void
1564	1558	bfa_ioim_sm_cmnd_retry(struct bfa_ioim_s *ioim, enum bfa_ioim_event event)
1565	1559	{
1566		- bfa_trc_fp(ioim->bfa, ioim->iotag);
1567		- bfa_trc_fp(ioim->bfa, event);
1568		-
1569	1560	switch (event) {
1570	1561	case BFA_IOIM_SM_FREE:
1571	1562	/* abts and rrq done. Now retry the IO with new tag */
...	...	@@ -1886,9 +1877,6 @@
1886	1877	static void
1887	1878	bfa_ioim_sm_hcb(struct bfa_ioim_s *ioim, enum bfa_ioim_event event)
1888	1879	{
1889		- bfa_trc_fp(ioim->bfa, ioim->iotag);
1890		- bfa_trc_fp(ioim->bfa, event);
1891		-
1892	1880	switch (event) {
1893	1881	case BFA_IOIM_SM_HCB:
1894	1882	bfa_sm_set_state(ioim, bfa_ioim_sm_uninit);
1895	1883
...	...	@@ -2529,9 +2517,7 @@
2529	2517	ioim = BFA_IOIM_FROM_TAG(fcpim, iotag);
2530	2518	WARN_ON(BFA_IOIM_TAG_2_ID(ioim->iotag) != iotag);
2531	2519
2532		- bfa_trc_fp(ioim->bfa, ioim->iotag);
2533	2520	bfa_ioim_cb_profile_comp(fcpim, ioim);
2534		-
2535	2521	bfa_sm_send_event(ioim, BFA_IOIM_SM_COMP_GOOD);
2536	2522	}
2537	2523
...	...	@@ -2608,7 +2594,6 @@
2608	2594	fcpim->ios_active++;
2609	2595
2610	2596	list_add_tail(&ioim->qe, &itnim->io_q);
2611		- bfa_trc_fp(ioim->bfa, ioim->iotag);
2612	2597
2613	2598	return ioim;
2614	2599	}
...	...	@@ -2618,12 +2603,6 @@
2618	2603	{
2619	2604	struct bfa_fcpim_mod_s *fcpim = ioim->fcpim;
2620	2605
2621		- bfa_trc_fp(ioim->bfa, ioim->iotag);
2622		- bfa_assert_fp(bfa_sm_cmp_state(ioim, bfa_ioim_sm_uninit));
2623		-
2624		- bfa_assert_fp(list_empty(&ioim->sgpg_q) \|\|
2625		- (ioim->nsges > BFI_SGE_INLINE));
2626		-
2627	2606	if (ioim->nsgpgs > 0)
2628	2607	bfa_sgpg_mfree(ioim->bfa, &ioim->sgpg_q, ioim->nsgpgs);
2629	2608
...	...	@@ -2638,8 +2617,6 @@
2638	2617	void
2639	2618	bfa_ioim_start(struct bfa_ioim_s *ioim)
2640	2619	{
2641		- bfa_trc_fp(ioim->bfa, ioim->iotag);
2642		-
2643	2620	bfa_ioim_cb_profile_start(ioim->fcpim, ioim);
2644	2621
2645	2622	/*
...	...	@@ -4670,8 +4670,6 @@
4670	4670	struct bfa_sgpg_s *hsgpg;
4671	4671	int i;
4672	4672
4673		- bfa_trc_fp(bfa, nsgpgs);
4674		-
4675	4673	if (mod->free_sgpgs < nsgpgs)
4676	4674	return BFA_STATUS_ENOMEM;
4677	4675
...	...	@@ -4690,8 +4688,6 @@
4690	4688	{
4691	4689	struct bfa_sgpg_mod_s *mod = BFA_SGPG_MOD(bfa);
4692	4690	struct bfa_sgpg_wqe_s *wqe;
4693		-
4694		- bfa_trc_fp(bfa, nsgpg);
4695	4691
4696	4692	mod->free_sgpgs += nsgpg;
4697	4693	WARN_ON(mod->free_sgpgs > mod->num_sgpgs);
...	...	@@ -1166,7 +1166,6 @@
1166	1166	spin_lock_irqsave(&bfad->bfad_lock, flags);
1167	1167	bfa_comp_free(&bfad->bfa, &doneq);
1168	1168	spin_unlock_irqrestore(&bfad->bfad_lock, flags);
1169		- bfa_trc_fp(bfad, irq);
1170	1169	}
1171	1170
1172	1171	return IRQ_HANDLED;
...	...	@@ -1174,7 +1174,6 @@
1174	1174	}
1175	1175
1176	1176	cmnd->host_scribble = (char *)hal_io;
1177		- bfa_trc_fp(bfad, hal_io->iotag);
1178	1177	bfa_ioim_start(hal_io);
1179	1178	spin_unlock_irqrestore(&bfad->bfad_lock, flags);
1180	1179