Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1628854

[PATCH v2 12/12] IB/ocrdma: One jump label less in ocrdma_alloc_ucontext_pd()

Show all headers | View raw

From: Markus Elfring <elfring@users.sourceforge.net>
Date: Sat, 22 Apr 2017 15:45:21 +0200

This issue was detected by using the Coccinelle software.

1. Return directly if a call of the function "_ocrdma_alloc_pd" failed.

2. Reduce the scope for the local variable "status" to one case
   of an if statement.

3. Delete the jump label "err" then.

4. Return zero as a constant at the end.

Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
Acked-by: Devesh Sharma <devesh.sharma@broadcom.com>
Reviewed-by: Yuval Shaia <yuval.shaia@oracle.com>
---
 drivers/infiniband/hw/ocrdma/ocrdma_verbs.c | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c b/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c
index 712c0dc9c980..fbceb9d9d5b0 100644
--- a/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c
+++ b/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c
@@ -484,19 +484,17 @@ static int ocrdma_alloc_ucontext_pd(struct ocrdma_dev *dev,
 				    struct ocrdma_ucontext *uctx,
 				    struct ib_udata *udata)
 {
-	int status = 0;
-
 	uctx->cntxt_pd = _ocrdma_alloc_pd(dev, uctx, udata);
 	if (IS_ERR(uctx->cntxt_pd)) {
-		status = PTR_ERR(uctx->cntxt_pd);
+		int status = PTR_ERR(uctx->cntxt_pd);
+
 		uctx->cntxt_pd = NULL;
-		goto err;
+		return status;
 	}
 
 	uctx->cntxt_pd->uctx = uctx;
 	uctx->cntxt_pd->ibpd.device = &dev->ibdev;
-err:
-	return status;
+	return 0;
 }
 
 static int ocrdma_dealloc_ucontext_pd(struct ocrdma_ucontext *uctx)
-- 
2.12.2

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH v2 00/12] InfiniBand-OCRDMA: Fine-tuning for several function  implementations SF Markus Elfring <elfring@users.sourceforge.net> - 2017-04-22 16:30 +0200
  [PATCH v2 01/12] IB/ocrdma: Use kcalloc() in  ocrdma_mbx_alloc_pd_range() SF Markus Elfring <elfring@users.sourceforge.net> - 2017-04-22 16:40 +0200
    Re: [PATCH v2 01/12] IB/ocrdma: Use kcalloc() in ocrdma_mbx_alloc_pd_range() Devesh Sharma <devesh.sharma@broadcom.com> - 2017-04-24 18:30 +0200
  [PATCH v2 02/12] IB/ocrdma: Use kcalloc() in five functions SF Markus Elfring <elfring@users.sourceforge.net> - 2017-04-22 16:40 +0200
  [PATCH v2 03/12] IB/ocrdma: Improve size determinations in ten  functions SF Markus Elfring <elfring@users.sourceforge.net> - 2017-04-22 16:40 +0200
    Re: [PATCH v2 03/12] IB/ocrdma: Improve size determinations in ten  functions Leon Romanovsky <leon@kernel.org> - 2017-04-23 09:40 +0200
      Re: [PATCH v2 03/12] IB/ocrdma: Improve size determinations in ten  functions Dennis Dalessandro <dennis.dalessandro@intel.com> - 2017-04-24 15:00 +0200
        Re: IB/ocrdma: Improve size determinations in ten functions SF Markus Elfring <elfring@users.sourceforge.net> - 2017-04-24 15:30 +0200
          Re: IB/ocrdma: Improve size determinations in ten functions Leon Romanovsky <leon@kernel.org> - 2017-04-24 16:40 +0200
            Re: IB/ocrdma: Improve size determinations in ten functions SF Markus Elfring <elfring@users.sourceforge.net> - 2017-04-24 17:00 +0200
        Re: [PATCH v2 03/12] IB/ocrdma: Improve size determinations in ten  functions Doug Ledford <dledford@redhat.com> - 2017-04-24 18:40 +0200
          Re: [PATCH v2 03/12] IB/ocrdma: Improve size determinations in ten  functions Leon Romanovsky <leon@kernel.org> - 2017-04-24 20:10 +0200
      Re: [PATCH v2 03/12] IB/ocrdma: Improve size determinations in ten  functions Doug Ledford <dledford@redhat.com> - 2017-04-24 18:40 +0200
  [PATCH v2 07/12] IB/ocrdma: Adjust 21 checks for null pointers SF Markus Elfring <elfring@users.sourceforge.net> - 2017-04-22 16:50 +0200
    Re: [PATCH v2 07/12] IB/ocrdma: Adjust 21 checks for null pointers Leon Romanovsky <leon@kernel.org> - 2017-04-23 08:10 +0200
  [PATCH v2 04/12] IB/ocrdma: Delete unnecessary variable  initialisations in ocrdma_mbx_get_dcbx_config() SF Markus Elfring <elfring@users.sourceforge.net> - 2017-04-22 16:50 +0200
  [PATCH v2 08/12] IB/ocrdma: Delete an error message for a failed  memory allocation in ocrdma_add() SF Markus Elfring <elfring@users.sourceforge.net> - 2017-04-22 16:50 +0200
  [PATCH v2 06/12] IB/ocrdma: Use kmalloc_array() in  ocrdma_create_srq() SF Markus Elfring <elfring@users.sourceforge.net> - 2017-04-22 16:50 +0200
  [PATCH v2 05/12] IB/ocrdma: Delete unnecessary braces SF Markus Elfring <elfring@users.sourceforge.net> - 2017-04-22 16:50 +0200
  [PATCH v2 11/12] IB/ocrdma: Delete an unnecessary variable in  ocrdma_dealloc_pd() SF Markus Elfring <elfring@users.sourceforge.net> - 2017-04-22 17:00 +0200
  [PATCH v2 12/12] IB/ocrdma: One jump label less in  ocrdma_alloc_ucontext_pd() SF Markus Elfring <elfring@users.sourceforge.net> - 2017-04-22 17:00 +0200
  [PATCH v2 09/12] IB/ocrdma: Delete an unnecessary variable assignment  in ocrdma_alloc_mr() SF Markus Elfring <elfring@users.sourceforge.net> - 2017-04-22 17:00 +0200
  [PATCH v2 10/12] IB/ocrdma: Returning only value constants in  ocrdma_resize_cq() SF Markus Elfring <elfring@users.sourceforge.net> - 2017-04-22 17:00 +0200

csiph-web