diff options
| author |   Mitko Haralanov <mitko.haralanov@intel.com> | 2016-02-03 14:33:31 -0800 |
|---|---|---|
| committer |   Doug Ledford <dledford@redhat.com> | 2016-03-10 20:37:51 -0500 |
| commit | 2780739262e32b9c283b6b04f7899f9803993ebc (patch) | |
| tree | d1d9b4c3b39358e244ab9b1f03ab6178e374970b /drivers/staging/rdma/hfi1 | |
| parent | staging/rdma/hfi1: Remove unused code (diff) | |
| download | linux-dev-2780739262e32b9c283b6b04f7899f9803993ebc.tar.xz linux-dev-2780739262e32b9c283b6b04f7899f9803993ebc.zip | |
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: Ira Weiny <ira.weiny@intel.com>
Signed-off-by: Mitko Haralanov <mitko.haralanov@intel.com>
Signed-off-by: Doug Ledford <dledford@redhat.com>
Diffstat (limited to 'drivers/staging/rdma/hfi1')
| -rw-r--r-- | drivers/staging/rdma/hfi1/hfi.h | 1 | ||||
| -rw-r--r-- | drivers/staging/rdma/hfi1/init.c | 5 | ||||
| -rw-r--r-- | drivers/staging/rdma/hfi1/qp.h | 2 | ||||
| -rw-r--r-- | drivers/staging/rdma/hfi1/verbs.c | 2 |
4 files changed, 2 insertions, 8 deletions
diff --git a/drivers/staging/rdma/hfi1/hfi.h b/drivers/staging/rdma/hfi1/hfi.h index cb2f90a0033c..897046cd8fa5 100644 --- a/drivers/staging/rdma/hfi1/hfi.h +++ b/drivers/staging/rdma/hfi1/hfi.h @@ -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 */ diff --git a/drivers/staging/rdma/hfi1/init.c b/drivers/staging/rdma/hfi1/init.c index 1680808d0b7c..17b876d77037 100644 --- a/drivers/staging/rdma/hfi1/init.c +++ b/drivers/staging/rdma/hfi1/init.c @@ -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; diff --git a/drivers/staging/rdma/hfi1/qp.h b/drivers/staging/rdma/hfi1/qp.h index 36be54771205..973c14b5268a 100644 --- a/drivers/staging/rdma/hfi1/qp.h +++ b/drivers/staging/rdma/hfi1/qp.h @@ -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))); } /** diff --git a/drivers/staging/rdma/hfi1/verbs.c b/drivers/staging/rdma/hfi1/verbs.c index 6d541caf4a51..d617324e3c48 100644 --- a/drivers/staging/rdma/hfi1/verbs.c +++ b/drivers/staging/rdma/hfi1/verbs.c @@ -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 */ |