diff options
| author |   Michael J. Ruhl <michael.j.ruhl@intel.com> | 2017-05-04 05:15:09 -0700 |
|---|---|---|
| committer |   Doug Ledford <dledford@redhat.com> | 2017-05-04 19:31:46 -0400 |
| commit | 9b60d2cbe07486658a32d4ed2fff7085c44bae7a (patch) | |
| tree | 8c69ce11f2a83b8109893c8529d071a354139fa6 /drivers/infiniband/hw/hfi1/init.c | |
| parent | IB/hfi1: Correctly clear the pkey (diff) | |
| download | linux-dev-9b60d2cbe07486658a32d4ed2fff7085c44bae7a.tar.xz linux-dev-9b60d2cbe07486658a32d4ed2fff7085c44bae7a.zip | |
IB/hfi1: Clean up context initialization
Context initialization mixes base context init with sub context init.
This is bad because contexts can be reused, and on reuse, reinit things
that should not re-initialized.
Normalize comments and function names to refer to base context and
sub context (not main, shared or slaves).
Separate the base context initialization from sub context initialization.
hfi1_init_ctxt() cannot return an error so changed to a void and remove
error message.
Reviewed-by: Mike Marciniszyn <mike.marciniszyn@intel.com>
Signed-off-by: Michael J. Ruhl <michael.j.ruhl@intel.com>
Signed-off-by: Dennis Dalessandro <dennis.dalessandro@intel.com>
Signed-off-by: Doug Ledford <dledford@redhat.com>
Diffstat (limited to 'drivers/infiniband/hw/hfi1/init.c')
| -rw-r--r-- | drivers/infiniband/hw/hfi1/init.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/drivers/infiniband/hw/hfi1/init.c b/drivers/infiniband/hw/hfi1/init.c index e872644b0f10..52a6364c30de 100644 --- a/drivers/infiniband/hw/hfi1/init.c +++ b/drivers/infiniband/hw/hfi1/init.c @@ -176,13 +176,7 @@ int hfi1_create_ctxts(struct hfi1_devdata *dd) goto nomem; } - ret = hfi1_init_ctxt(rcd->sc); - if (ret < 0) { - dd_dev_err(dd, - "Failed to setup kernel receive context, failing\n"); - ret = -EFAULT; - goto bail; - } + hfi1_init_ctxt(rcd->sc); } /* @@ -194,7 +188,7 @@ int hfi1_create_ctxts(struct hfi1_devdata *dd) return 0; nomem: ret = -ENOMEM; -bail: + if (dd->rcd) { for (i = 0; i < dd->num_rcv_contexts; ++i) hfi1_free_ctxtdata(dd, dd->rcd[i]); |