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

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

bna: get rid of private macros for manipulation with lists 



Remove macros for manipulation with struct list_head and replace them
with standard ones.

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

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

+0 −1
Original line number Diff line number Diff line
@@ -282,7 +282,6 @@ bfa_nw_cee_attach(struct bfa_cee *cee, struct bfa_ioc *ioc, 
	cee->ioc = ioc;



	bfa_nw_ioc_mbox_regisr(cee->ioc, BFI_MC_CEE, bfa_cee_isr, cee);

	bfa_q_qe_init(&cee->ioc_notify);

	bfa_ioc_notify_init(&cee->ioc_notify, bfa_cee_notify, cee);

	bfa_nw_ioc_notify_register(cee->ioc, &cee->ioc_notify);

}

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

+6 −4
Original line number Diff line number Diff line
@@ -2163,7 +2163,8 @@ bfa_ioc_mbox_poll(struct bfa_ioc *ioc) 
	/**

	 * Enqueue command to firmware.

	 */

	bfa_q_deq(&mod->cmd_q, &cmd);

	cmd = list_first_entry(&mod->cmd_q, struct bfa_mbox_cmd, qe);

	list_del(&cmd->qe);

	bfa_ioc_mbox_send(ioc, cmd->msg, sizeof(cmd->msg));



	/**
@@ -2184,8 +2185,10 @@ bfa_ioc_mbox_flush(struct bfa_ioc *ioc) 
	struct bfa_ioc_mbox_mod *mod = &ioc->mbox_mod;

	struct bfa_mbox_cmd *cmd;



	while (!list_empty(&mod->cmd_q))

		bfa_q_deq(&mod->cmd_q, &cmd);

	while (!list_empty(&mod->cmd_q)) {

		cmd = list_first_entry(&mod->cmd_q, struct bfa_mbox_cmd, qe);

		list_del(&cmd->qe);

	}

}



/**
@@ -3231,7 +3234,6 @@ bfa_nw_flash_attach(struct bfa_flash *flash, struct bfa_ioc *ioc, void *dev) 
	flash->op_busy = 0;



	bfa_nw_ioc_mbox_regisr(flash->ioc, BFI_MC_FLASH, bfa_flash_intr, flash);

	bfa_q_qe_init(&flash->ioc_notify);

	bfa_ioc_notify_init(&flash->ioc_notify, bfa_flash_notify, flash);

	list_add_tail(&flash->ioc_notify.qe, &flash->ioc->notify_q);

}

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

+5 −5
Original line number Diff line number Diff line
@@ -66,8 +66,9 @@ cmdq_sm_stopped_entry(struct bfa_msgq_cmdq *cmdq) 
	cmdq->offset = 0;

	cmdq->bytes_to_copy = 0;

	while (!list_empty(&cmdq->pending_q)) {

		bfa_q_deq(&cmdq->pending_q, &cmdq_ent);

		bfa_q_qe_init(&cmdq_ent->qe);

		cmdq_ent = list_first_entry(&cmdq->pending_q,

					    struct bfa_msgq_cmd_entry, qe);

		list_del(&cmdq_ent->qe);

		call_cmdq_ent_cbfn(cmdq_ent, BFA_STATUS_FAILED);

	}

}
@@ -242,8 +243,8 @@ bfa_msgq_cmdq_ci_update(struct bfa_msgq_cmdq *cmdq, struct bfi_mbmsg *mb) 


	/* Walk through pending list to see if the command can be posted */

	while (!list_empty(&cmdq->pending_q)) {

		cmd =

		(struct bfa_msgq_cmd_entry *)bfa_q_first(&cmdq->pending_q);

		cmd = list_first_entry(&cmdq->pending_q,

				       struct bfa_msgq_cmd_entry, qe);

		if (ntohs(cmd->msg_hdr->num_entries) <=

			BFA_MSGQ_FREE_CNT(cmdq)) {

			list_del(&cmd->qe);
@@ -615,7 +616,6 @@ bfa_msgq_attach(struct bfa_msgq *msgq, struct bfa_ioc *ioc) 
	bfa_msgq_rspq_attach(&msgq->rspq, msgq);



	bfa_nw_ioc_mbox_regisr(msgq->ioc, BFI_MC_MSGQ, bfa_msgq_isr, msgq);

	bfa_q_qe_init(&msgq->ioc_notify);

	bfa_ioc_notify_init(&msgq->ioc_notify, bfa_msgq_notify, msgq);

	bfa_nw_ioc_notify_register(msgq->ioc, &msgq->ioc_notify);

}

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

+0 −1
Original line number Diff line number Diff line
@@ -283,7 +283,6 @@ void bna_hw_stats_get(struct bna *bna); 


/* APIs for RxF */

struct bna_mac *bna_cam_mod_mac_get(struct list_head *head);

void bna_cam_mod_mac_put(struct list_head *tail, struct bna_mac *mac);

struct bna_mcam_handle *bna_mcam_mod_handle_get(struct bna_mcam_mod *mod);

void bna_mcam_mod_handle_put(struct bna_mcam_mod *mcam_mod,

			  struct bna_mcam_handle *handle);

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

+17 −33
Original line number Diff line number Diff line
@@ -1792,17 +1792,13 @@ bna_ucam_mod_init(struct bna_ucam_mod *ucam_mod, struct bna *bna, 
	res_info[BNA_MOD_RES_MEM_T_UCMAC_ARRAY].res_u.mem_info.mdl[0].kva;



	INIT_LIST_HEAD(&ucam_mod->free_q);

	for (i = 0; i < bna->ioceth.attr.num_ucmac; i++) {

		bfa_q_qe_init(&ucam_mod->ucmac[i].qe);

	for (i = 0; i < bna->ioceth.attr.num_ucmac; i++)

		list_add_tail(&ucam_mod->ucmac[i].qe, &ucam_mod->free_q);

	}



	/* A separate queue to allow synchronous setting of a list of MACs */

	INIT_LIST_HEAD(&ucam_mod->del_q);

	for (i = i; i < (bna->ioceth.attr.num_ucmac * 2); i++) {

		bfa_q_qe_init(&ucam_mod->ucmac[i].qe);

	for (i = i; i < (bna->ioceth.attr.num_ucmac * 2); i++)

		list_add_tail(&ucam_mod->ucmac[i].qe, &ucam_mod->del_q);

	}



	ucam_mod->bna = bna;

}
@@ -1834,27 +1830,21 @@ bna_mcam_mod_init(struct bna_mcam_mod *mcam_mod, struct bna *bna, 
	res_info[BNA_MOD_RES_MEM_T_MCMAC_ARRAY].res_u.mem_info.mdl[0].kva;



	INIT_LIST_HEAD(&mcam_mod->free_q);

	for (i = 0; i < bna->ioceth.attr.num_mcmac; i++) {

		bfa_q_qe_init(&mcam_mod->mcmac[i].qe);

	for (i = 0; i < bna->ioceth.attr.num_mcmac; i++)

		list_add_tail(&mcam_mod->mcmac[i].qe, &mcam_mod->free_q);

	}



	mcam_mod->mchandle = (struct bna_mcam_handle *)

	res_info[BNA_MOD_RES_MEM_T_MCHANDLE_ARRAY].res_u.mem_info.mdl[0].kva;



	INIT_LIST_HEAD(&mcam_mod->free_handle_q);

	for (i = 0; i < bna->ioceth.attr.num_mcmac; i++) {

		bfa_q_qe_init(&mcam_mod->mchandle[i].qe);

	for (i = 0; i < bna->ioceth.attr.num_mcmac; i++)

		list_add_tail(&mcam_mod->mchandle[i].qe,

			      &mcam_mod->free_handle_q);

	}



	/* A separate queue to allow synchronous setting of a list of MACs */

	INIT_LIST_HEAD(&mcam_mod->del_q);

	for (i = i; i < (bna->ioceth.attr.num_mcmac * 2); i++) {

		bfa_q_qe_init(&mcam_mod->mcmac[i].qe);

	for (i = i; i < (bna->ioceth.attr.num_mcmac * 2); i++)

		list_add_tail(&mcam_mod->mcmac[i].qe, &mcam_mod->del_q);

	}



	mcam_mod->bna = bna;

}
@@ -2090,32 +2080,26 @@ bna_num_rxp_set(struct bna *bna, int num_rxp) 
struct bna_mac *

bna_cam_mod_mac_get(struct list_head *head)

{

	struct list_head *qe;

	struct bna_mac *mac;



	if (list_empty(head))

		return NULL;

	mac = list_first_entry_or_null(head, struct bna_mac, qe);

	if (mac)

		list_del(&mac->qe);



	bfa_q_deq(head, &qe);

	return (struct bna_mac *)qe;

}



void

bna_cam_mod_mac_put(struct list_head *tail, struct bna_mac *mac)

{

	list_add_tail(&mac->qe, tail);

	return mac;

}



struct bna_mcam_handle *

bna_mcam_mod_handle_get(struct bna_mcam_mod *mcam_mod)

{

	struct list_head *qe;



	if (list_empty(&mcam_mod->free_handle_q))

		return NULL;

	struct bna_mcam_handle *handle;



	bfa_q_deq(&mcam_mod->free_handle_q, &qe);

	handle = list_first_entry_or_null(&mcam_mod->free_handle_q,

					  struct bna_mcam_handle, qe);

	if (handle)

		list_del(&handle->qe);



	return (struct bna_mcam_handle *)qe;

	return handle;

}



void