staging/hfi1: Remove un-needed variable

There is no need to use a separate variable for a
return value and a label when returning right away
would do just as well.

Signed-off-by: Mitko Haralanov <mitko.haralanov@intel.com>
Reviewed-by: Ira Weiny <ira.weiny@intel.com>
Signed-off-by: Doug Ledford <dledford@redhat.com>

diff --git a/drivers/staging/rdma/hfi1/file_ops.c b/drivers/staging/rdma/hfi1/file_ops.c
index c66693532be0256b2b79fc4d4f68b9b35bf3f3cd..76fe60315bb458b1b41c04c46e2dfc078f4910d1 100644 (file)
--- a/drivers/staging/rdma/hfi1/file_ops.c
+++ b/drivers/staging/rdma/hfi1/file_ops.c
@@ -1037,22 +1037,19 @@ static int allocate_ctxt(struct file *fp, struct hfi1_devdata *dd,
 static int init_subctxts(struct hfi1_ctxtdata *uctxt,
                         const struct hfi1_user_info *uinfo)
 {
-       int ret = 0;
        unsigned num_subctxts;
 
        num_subctxts = uinfo->subctxt_cnt;
-       if (num_subctxts > HFI1_MAX_SHARED_CTXTS) {
-               ret = -EINVAL;
-               goto bail;
-       }
+       if (num_subctxts > HFI1_MAX_SHARED_CTXTS)
+               return -EINVAL;
 
        uctxt->subctxt_cnt = uinfo->subctxt_cnt;
        uctxt->subctxt_id = uinfo->subctxt_id;
        uctxt->active_slaves = 1;
        uctxt->redirect_seq_cnt = 1;
        set_bit(HFI1_CTXT_MASTER_UNINIT, &uctxt->event_flags);
-bail:
-       return ret;
+
+       return 0;
 }
 
 static int setup_subctxt(struct hfi1_ctxtdata *uctxt)