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

Commit 27807392 authored by Mitko Haralanov's avatar Mitko Haralanov Committed by Doug Ledford
Browse files

staging/rdma/hfi1: Remove unnecessary duplicated variable 



struct hfi1_devdata contained 2 variables which represented the numa
node the device is attached to.  Remove the duplicated one.

Reviewed-by: default avatarIra Weiny <ira.weiny@intel.com>
Signed-off-by: default avatarMitko Haralanov <mitko.haralanov@intel.com>
Signed-off-by: default avatarDoug Ledford <dledford@redhat.com>
parent d413c1a6

drivers/staging/rdma/hfi1/hfi.h

+0 −1
Original line number Diff line number Diff line
@@ -1128,7 +1128,6 @@ struct hfi1_devdata { 
	struct timer_list rcverr_timer;

	u32 rcv_ovfl_cnt;



	int assigned_node_id;

	wait_queue_head_t event_queue;



	/* Save the enabled LCB error bits */

drivers/staging/rdma/hfi1/init.c

+0 −5
Original line number Diff line number Diff line
@@ -130,15 +130,10 @@ int hfi1_create_ctxts(struct hfi1_devdata *dd) 
{

	unsigned i;

	int ret;

	int local_node_id = pcibus_to_node(dd->pcidev->bus);



	/* Control context has to be always 0 */

	BUILD_BUG_ON(HFI1_CTRL_CTXT != 0);



	if (local_node_id < 0)

		local_node_id = numa_node_id();

	dd->assigned_node_id = local_node_id;



	dd->rcd = kcalloc(dd->num_rcv_contexts, sizeof(*dd->rcd), GFP_KERNEL);

	if (!dd->rcd)

		goto nomem;

drivers/staging/rdma/hfi1/qp.h

+1 −1
Original line number Diff line number Diff line
@@ -157,7 +157,7 @@ static inline void _hfi1_schedule_send(struct rvt_qp *qp) 
	iowait_schedule(&priv->s_iowait, ppd->hfi1_wq,

			priv->s_sde ?

			priv->s_sde->cpu :

			cpumask_first(cpumask_of_node(dd->assigned_node_id)));

			cpumask_first(cpumask_of_node(dd->node)));

}



/**

drivers/staging/rdma/hfi1/verbs.c

+1 −1
Original line number Diff line number Diff line
@@ -1567,7 +1567,7 @@ int hfi1_register_ib_device(struct hfi1_devdata *dd) 
	snprintf(dd->verbs_dev.rdi.dparms.cq_name,

		 sizeof(dd->verbs_dev.rdi.dparms.cq_name),

		 "hfi1_cq%d", dd->unit);

	dd->verbs_dev.rdi.dparms.node = dd->assigned_node_id;

	dd->verbs_dev.rdi.dparms.node = dd->node;



	/* misc settings */

	dd->verbs_dev.rdi.flags = 0; /* Let rdmavt handle it all */