Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a1ac490d authored by Ivan Vecera's avatar Ivan Vecera Committed by David S. Miller
Browse files

bna: get rid of duplicate and unused macros 



replaced macros:
BNA_MAC_IS_EQUAL -> ether_addr_equal
BNA_POWER_OF_2 -> is_power_of_2
BNA_TO_POWER_OF_2_HIGH -> roundup_pow_of_two

removed unused macros:
bfa_fsm_get_state
bfa_ioc_clr_stats
bfa_ioc_fetch_stats
bfa_ioc_get_alt_ioc_fwstate
bfa_ioc_isr_mode_set
bfa_ioc_maxfrsize
bfa_ioc_mbox_cmd_pending
bfa_ioc_ownership_reset
bfa_ioc_rx_bbcredit
bfa_ioc_state_disabled
bfa_sm_cmp_state
bfa_sm_get_state
bfa_sm_send_event
bfa_sm_set_state
bfa_sm_state_decl
BFA_STRING_32
BFI_ADAPTER_IS_{PROTO,TTV,UNSUPP)
BFI_IOC_ENDIAN_SIG
BNA_{C,RX,TX}Q_PAGE_INDEX_MAX
BNA_{C,RX,TX}Q_PAGE_INDEX_MAX_SHIFT
BNA_{C,RX,TX}Q_QPGE_PTR_GET
BNA_IOC_TIMER_FREQ
BNA_MESSAGE_SIZE
BNA_QE_INDX_2_PTR
BNA_QE_INDX_RANGE
BNA_Q_GET_{C,P}I
BNA_Q_{C,P}I_ADD
BNA_Q_FREE_COUNT
BNA_Q_IN_USE_COUNT
BNA_TO_POWER_OF_2
containing_rec

Signed-off-by: default avatarIvan Vecera <ivecera@redhat.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent e423c856

drivers/net/ethernet/brocade/bna/bfa_cs.h

+0 −14
Original line number Diff line number Diff line
@@ -28,19 +28,6 @@ 


typedef void (*bfa_sm_t)(void *sm, int event);



/* oc - object class eg. bfa_ioc

 * st - state, eg. reset

 * otype - object type, eg. struct bfa_ioc

 * etype - object type, eg. enum ioc_event

 */

#define bfa_sm_state_decl(oc, st, otype, etype)			\

	static void oc ## _sm_ ## st(otype * fsm, etype event)



#define bfa_sm_set_state(_sm, _state)	((_sm)->sm = (bfa_sm_t)(_state))

#define bfa_sm_send_event(_sm, _event)	((_sm)->sm((_sm), (_event)))

#define bfa_sm_get_state(_sm)		((_sm)->sm)

#define bfa_sm_cmp_state(_sm, _state)	((_sm)->sm == (bfa_sm_t)(_state))



/* For converting from state machine function to state encoding. */

struct bfa_sm_table {

	bfa_sm_t	sm;	/*!< state machine function	*/
@@ -67,7 +54,6 @@ typedef void (*bfa_fsm_t)(void *fsm, int event); 
} while (0)



#define bfa_fsm_send_event(_fsm, _event)	((_fsm)->fsm((_fsm), (_event)))

#define bfa_fsm_get_state(_fsm)			((_fsm)->fsm)

#define bfa_fsm_cmp_state(_fsm, _state)					\

	((_fsm)->fsm == (bfa_fsm_t)(_state))

drivers/net/ethernet/brocade/bna/bfa_defs.h

+0 −1
Original line number Diff line number Diff line
@@ -24,7 +24,6 @@ 
#include "bfa_defs_status.h"

#include "bfa_defs_mfg_comm.h"



#define BFA_STRING_32	32

#define BFA_VERSION_LEN 64



/* ---------------------- adapter definitions ------------ */

drivers/net/ethernet/brocade/bna/bfa_ioc.c

+0 −14
Original line number Diff line number Diff line
@@ -23,14 +23,6 @@ 


/* IOC local definitions */



#define bfa_ioc_state_disabled(__sm)			\

	(((__sm) == BFI_IOC_UNINIT) ||			\

	 ((__sm) == BFI_IOC_INITING) ||			\

	 ((__sm) == BFI_IOC_HWINIT) ||			\

	 ((__sm) == BFI_IOC_DISABLED) ||		\

	 ((__sm) == BFI_IOC_FAIL) ||			\

	 ((__sm) == BFI_IOC_CFG_DISABLED))



/* Asic specific macros : see bfa_hw_cb.c and bfa_hw_ct.c for details. */



#define bfa_ioc_firmware_lock(__ioc)			\
@@ -57,12 +49,6 @@ 
			((__ioc)->ioc_hwif->ioc_get_fwstate(__ioc))

#define bfa_ioc_set_alt_ioc_fwstate(__ioc, __fwstate)		\

		((__ioc)->ioc_hwif->ioc_set_alt_fwstate(__ioc, __fwstate))

#define bfa_ioc_get_alt_ioc_fwstate(__ioc)		\

			((__ioc)->ioc_hwif->ioc_get_alt_fwstate(__ioc))



#define bfa_ioc_mbox_cmd_pending(__ioc)		\

			(!list_empty(&((__ioc)->mbox_mod.cmd_q)) || \

			readl((__ioc)->ioc_regs.hfn_mbox_cmd))



static bool bfa_nw_auto_recover = true;

drivers/net/ethernet/brocade/bna/bfa_ioc.h

+0 −13
Original line number Diff line number Diff line
@@ -232,12 +232,6 @@ struct bfa_ioc_hwif { 
#define bfa_ioc_asic_gen(__ioc)		((__ioc)->asic_gen)

#define bfa_ioc_is_default(__ioc)	\

	(bfa_ioc_pcifn(__ioc) == bfa_ioc_portid(__ioc))

#define bfa_ioc_fetch_stats(__ioc, __stats) \

		(((__stats)->drv_stats) = (__ioc)->stats)

#define bfa_ioc_clr_stats(__ioc)	\

		memset(&(__ioc)->stats, 0, sizeof((__ioc)->stats))

#define bfa_ioc_maxfrsize(__ioc)	((__ioc)->attr->maxfrsize)

#define bfa_ioc_rx_bbcredit(__ioc)	((__ioc)->attr->rx_bbcredit)

#define bfa_ioc_speed_sup(__ioc)	\

	BFI_ADAPTER_GETP(SPEED, (__ioc)->attr->adapter_prop)

#define bfa_ioc_get_nports(__ioc)	\
@@ -268,13 +262,6 @@ void bfa_nw_ioc_mbox_regisr(struct bfa_ioc *ioc, enum bfi_mclass mc, 
	((__ioc)->ioc_hwif->ioc_pll_init((__ioc)->pcidev.pci_bar_kva, \

			   (__ioc)->asic_mode))



#define	bfa_ioc_isr_mode_set(__ioc, __msix) do {			\

	if ((__ioc)->ioc_hwif->ioc_isr_mode_set)			\

		((__ioc)->ioc_hwif->ioc_isr_mode_set(__ioc, __msix));	\

} while (0)

#define	bfa_ioc_ownership_reset(__ioc)				\

			((__ioc)->ioc_hwif->ioc_ownership_reset(__ioc))



#define bfa_ioc_lpu_read_stat(__ioc) do {				\

		if ((__ioc)->ioc_hwif->ioc_lpu_read_stat)		\

			((__ioc)->ioc_hwif->ioc_lpu_read_stat(__ioc));	\

drivers/net/ethernet/brocade/bna/bfi.h

+0 −8
Original line number Diff line number Diff line
@@ -315,8 +315,6 @@ enum bfi_ioc_state { 
	BFI_IOC_MEMTEST		= 9,	/*!< IOC is doing memtest	     */

};



#define BFI_IOC_ENDIAN_SIG  0x12345678



enum {

	BFI_ADAPTER_TYPE_FC	= 0x01,		/*!< FC adapters	   */

	BFI_ADAPTER_TYPE_MK	= 0x0f0000,	/*!< adapter type mask     */
@@ -335,12 +333,6 @@ enum { 
		BFI_ADAPTER_ ## __prop ## _SH)

#define BFI_ADAPTER_SETP(__prop, __val)				\

	((__val) << BFI_ADAPTER_ ## __prop ## _SH)

#define BFI_ADAPTER_IS_PROTO(__adap_type)			\

	((__adap_type) & BFI_ADAPTER_PROTO)

#define BFI_ADAPTER_IS_TTV(__adap_type)				\

	((__adap_type) & BFI_ADAPTER_TTV)

#define BFI_ADAPTER_IS_UNSUPP(__adap_type)			\

	((__adap_type) & BFI_ADAPTER_UNSUPP)

#define BFI_ADAPTER_IS_SPECIAL(__adap_type)			\

	((__adap_type) & (BFI_ADAPTER_TTV | BFI_ADAPTER_PROTO |	\

			BFI_ADAPTER_UNSUPP))