InfiniBand-OCRDMA: Fine-tuning for several function implementations

From: Markus Elfring <[email protected]>
Date: Tue, 7 Mar 2017 18:23:54 +0100

* Multiplications for the size determination of memory allocations indicated that array data structures should be processed. Thus reuse the corresponding function "kcalloc".

This issue was detected by using the Coccinelle software.

* Delete the local variable "pd_bitmap_size" which became unnecessary with this refactoring.

Signed-off-by Markus Elfring <[email protected]>

---
 drivers/infiniband/hw/ocrdma/ocrdma_hw.c | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

drivers/infiniband/hw/ocrdma/ocrdma_hw.c +0 -1

index cbac41b15d94..d5a3127b6df8 100644
@@ -1505,7 +1505,6 @@ int ocrdma_mbx_dealloc_pd(struct ocrdma_dev *dev, struct ocrdma_pd *pd)
 static int ocrdma_mbx_alloc_pd_range(struct ocrdma_dev *dev)
 {
 	int status = -ENOMEM;
-	size_t pd_bitmap_size;
 	struct ocrdma_alloc_pd_range *cmd;
 	struct ocrdma_alloc_pd_range_rsp *rsp;
 

drivers/infiniband/hw/ocrdma/ocrdma_hw.c +4 -3

 		}
 		kfree(cmd);
 	}

@@ -1546,9 +1545,10 @@ static int ocrdma_mbx_alloc_pd_range(struct ocrdma_dev *dev)
 		dev->pd_mgr->pd_norm_start = rsp->dpp_page_pdid &
 					OCRDMA_ALLOC_PD_RNG_RSP_START_PDID_MASK;
 		dev->pd_mgr->max_normal_pd = rsp->pd_count;
-		pd_bitmap_size = BITS_TO_LONGS(rsp->pd_count) * sizeof(long);
-		dev->pd_mgr->pd_norm_bitmap = kzalloc(pd_bitmap_size,
-						      GFP_KERNEL);
+		dev->pd_mgr->pd_norm_bitmap
+			= kcalloc(BITS_TO_LONGS(rsp->pd_count),
+						sizeof(long),
+						GFP_KERNEL);
 	}
 	kfree(cmd);
 

Signature · 6 lines

2.12.0

--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Quoted 48 lines · SF Markus Elfring

From: Markus Elfring <[email protected]>
Date: Tue, 7 Mar 2017 18:23:54 +0100

* Multiplications for the size determination of memory allocations indicated that array data structures should be processed. Thus reuse the corresponding function "kcalloc".

  This issue was detected by using the Coccinelle software.

* Delete the local variable "pd_bitmap_size" which became unnecessary with
  this refactoring.

Signed-off-by Markus Elfring <[email protected]>

---
 drivers/infiniband/hw/ocrdma/ocrdma_hw.c | 16 ++++++++--------

 1 file changed, 8 insertions(+), 8 deletions(-)

drivers/infiniband/hw/ocrdma/ocrdma_hw.c +0 -1

index cbac41b15d94..d5a3127b6df8 100644
@@ -1505,7 +1505,6 @@ int ocrdma_mbx_dealloc_pd(struct ocrdma_dev
 *dev, struct ocrdma_pd *pd)
  static int ocrdma_mbx_alloc_pd_range(struct ocrdma_dev *dev)
  {
  	int status = -ENOMEM;
-	size_t pd_bitmap_size;
  	struct ocrdma_alloc_pd_range *cmd;
  	struct ocrdma_alloc_pd_range_rsp *rsp;

drivers/infiniband/hw/ocrdma/ocrdma_hw.c +0 -0

@@ -1527,10 +1526,10 @@ static int ocrdma_mbx_alloc_pd_range(struct
 ocrdma_dev *dev)

  dev->pd_mgr->pd_dpp_start = rsp-

Quoted 1 line

dpp_page_pdid &

  OCRDMA_ALLOC_PD_RNG_RSP_ST ART_PDID_MASK;
  dev->pd_mgr->max_dpp_pd = rsp->pd_count;

drivers/infiniband/hw/ocrdma/ocrdma_hw.c +0 -1

-			pd_bitmap_size > > -				BITS_TO_LONGS(rsp->pd_count) *

sizeof(long);

drivers/infiniband/hw/ocrdma/ocrdma_hw.c +0 -2

-			dev->pd_mgr->pd_dpp_bitmap > > kzalloc(pd_bitmap_size,
-							     GFP_K

ERNEL);

drivers/infiniband/hw/ocrdma/ocrdma_hw.c +2 -0

+			dev->pd_mgr->pd_dpp_bitmap
+				= kcalloc(BITS_TO_LONGS(rsp-

Quoted 1 line

pd_count),

Quoted 4 lines

drivers/infiniband/hw/ocrdma/ocrdma_hw.c +1 -0

+							sizeof(lon

g),

drivers/infiniband/hw/ocrdma/ocrdma_hw.c +1 -0

+							GFP_KERNEL

);

kzalloc gives "clean" buffer.
Just making sure that it is fine with you if the array is not "clean".
(looking at _ocrdma_pd_mgr_get_bitmap i think it should).

Quoted 29 lines

  }
  kfree(cmd);
  }

drivers/infiniband/hw/ocrdma/ocrdma_hw.c +0 -0

@@ -1546,9 +1545,10 @@ static int ocrdma_mbx_alloc_pd_range(struct
 ocrdma_dev *dev)

  dev->pd_mgr->pd_norm_start = rsp->dpp_page_pdid & OCRDMA_ALLOC_PD_RNG_RSP_ST ART_PDID_MASK;
  dev->pd_mgr->max_normal_pd = rsp->pd_count;

drivers/infiniband/hw/ocrdma/ocrdma_hw.c +0 -1

-		pd_bitmap_size = BITS_TO_LONGS(rsp->pd_count) *

sizeof(long);

drivers/infiniband/hw/ocrdma/ocrdma_hw.c +4 -2

-		dev->pd_mgr->pd_norm_bitmap > > kzalloc(pd_bitmap_size,
-						      GFP_KERNEL);
+		dev->pd_mgr->pd_norm_bitmap
+			= kcalloc(BITS_TO_LONGS(rsp->pd_count),
+						sizeof(long),
+						GFP_KERNEL);

  }
  kfree(cmd);

--
2.12.0

--
To unsubscribe from this list: send the line "unsubscribe linux- rdma" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

From: Markus Elfring <[email protected]>
Date: Tue, 7 Mar 2017 19:09:20 +0100

Replace the specification of data structures by references for variables as the parameter for the operator "sizeof" to make the corresponding size determinations a bit safer according to the Linux coding style convention.

Signed-off-by Markus Elfring <[email protected]>

---
 drivers/infiniband/hw/ocrdma/ocrdma_hw.c | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

drivers/infiniband/hw/ocrdma/ocrdma_hw.c +3 -5

index d5a3127b6df8..85bebb887c5c 100644
@@ -2901,9 +2901,8 @@ static int ocrdma_mbx_get_dcbx_config(struct ocrdma_dev *dev, u32 ptype,
 	struct pci_dev *pdev = dev->nic_info.pdev;
 	struct ocrdma_mqe_sge *mqe_sge = cmd.u.nonemb_req.sge;
 
-	memset(&cmd, 0, sizeof(struct ocrdma_mqe));
-	cmd.hdr.pyld_len = max_t (u32, sizeof(struct ocrdma_get_dcbx_cfg_rsp),
-					sizeof(struct ocrdma_get_dcbx_cfg_req));
+	memset(&cmd, 0, sizeof(cmd));
+	cmd.hdr.pyld_len = max_t(u32, sizeof(*rsp), sizeof(*req));
 	req = dma_alloc_coherent(&pdev->dev, cmd.hdr.pyld_len, &pa, GFP_KERNEL);
 	if (!req) {
 		status = -ENOMEM;

@@ -2915,8 +2914,7 @@ static int ocrdma_mbx_get_dcbx_config(struct ocrdma_dev *dev, u32 ptype,
 	mqe_sge->pa_lo = (u32) (pa & 0xFFFFFFFFUL);
 	mqe_sge->pa_hi = (u32) upper_32_bits(pa);
 	mqe_sge->len = cmd.hdr.pyld_len;
-
-	memset(req, 0, sizeof(struct ocrdma_get_dcbx_cfg_req));
+	memset(req, 0, sizeof(*req));
 	ocrdma_init_mch(&req->hdr, OCRDMA_CMD_GET_DCBX_CONFIG,
 			OCRDMA_SUBSYS_DCBX, cmd.hdr.pyld_len);
 	req->param_type = ptype;

@@ -2926,9 +2924,8 @@ static int ocrdma_mbx_get_dcbx_config(struct ocrdma_dev *dev, u32 ptype,
 		goto mbx_err;

Signature · 6 lines

2.12.0

--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Quoted 40 lines · SF Markus Elfring

From: Markus Elfring <[email protected]>
Date: Tue, 7 Mar 2017 19:09:20 +0100

Replace the specification of data structures by references for variables as the parameter for the operator "sizeof" to make the corresponding size determinations a bit safer according to the Linux coding style convention.

Signed-off-by Markus Elfring <[email protected]>

---
 drivers/infiniband/hw/ocrdma/ocrdma_hw.c | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

drivers/infiniband/hw/ocrdma/ocrdma_hw.c +3 -5

index d5a3127b6df8..85bebb887c5c 100644
@@ -2901,9 +2901,8 @@ static int ocrdma_mbx_get_dcbx_config(struct ocrdma_dev *dev, u32 ptype,
      struct pci_dev *pdev = dev->nic_info.pdev;
      struct ocrdma_mqe_sge *mqe_sge = cmd.u.nonemb_req.sge;
 
-     memset(&cmd, 0, sizeof(struct ocrdma_mqe));
-     cmd.hdr.pyld_len = max_t (u32, sizeof(struct ocrdma_get_dcbx_cfg_rsp),
-                                     sizeof(struct ocrdma_get_dcbx_cfg_req));
+     memset(&cmd, 0, sizeof(cmd));
+     cmd.hdr.pyld_len = max_t(u32, sizeof(*rsp), sizeof(*req));
      req = dma_alloc_coherent(&pdev->dev, cmd.hdr.pyld_len, &pa, GFP_KERNEL);
      if (!req) {
              status = -ENOMEM;

@@ -2915,8 +2914,7 @@ static int ocrdma_mbx_get_dcbx_config(struct ocrdma_dev *dev, u32 ptype,
      mqe_sge->pa_lo = (u32) (pa & 0xFFFFFFFFUL);
      mqe_sge->pa_hi = (u32) upper_32_bits(pa);
      mqe_sge->len = cmd.hdr.pyld_len;
-
-     memset(req, 0, sizeof(struct ocrdma_get_dcbx_cfg_req));
+     memset(req, 0, sizeof(*req));
      ocrdma_init_mch(&req->hdr, OCRDMA_CMD_GET_DCBX_CONFIG,
                      OCRDMA_SUBSYS_DCBX, cmd.hdr.pyld_len);
      req->param_type = ptype;

@@ -2926,9 +2924,8 @@ static int ocrdma_mbx_get_dcbx_config(struct ocrdma_dev *dev, u32 ptype,
              goto mbx_err;

drivers/infiniband/hw/ocrdma/ocrdma_hw.c static int ocrdma_mbx_get_dcbx_config(struct ocrdma_dev *dev, u32 ptype, · line 2931

Quoted 10 lines

drivers/infiniband/hw/ocrdma/ocrdma_hw.c +2 -3

 
      rsp = (struct ocrdma_get_dcbx_cfg_rsp *)req;
-     ocrdma_le32_to_cpu(rsp, sizeof(struct ocrdma_get_dcbx_cfg_rsp));
-     memcpy(dcbxcfg, &rsp->cfg, sizeof(struct ocrdma_dcbx_cfg));
-
+     ocrdma_le32_to_cpu(rsp, sizeof(*rsp));
+     memcpy(dcbxcfg, &rsp->cfg, sizeof(*dcbxcfg));
 mbx_err:
      dma_free_coherent(&pdev->dev, cmd.hdr.pyld_len, req, pa);
 mem_err:

Reviewed-by Yuval Shaia <[email protected]>

Quoted 7 lines

--
2.12.0

--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html

From: Markus Elfring <[email protected]>
Date: Tue, 7 Mar 2017 19:25:55 +0100

The local variables "req" and "rsp" will be set to appropriate pointers a bit later. Thus omit the explicit initialisations at the beginning.

Signed-off-by Markus Elfring <[email protected]>

---
 drivers/infiniband/hw/ocrdma/ocrdma_hw.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

drivers/infiniband/hw/ocrdma/ocrdma_hw.c +0 -0

index 85bebb887c5c..517a18e9351a 100644

drivers/infiniband/hw/ocrdma/ocrdma_hw.c +0 -0

 	struct pci_dev *pdev = dev->nic_info.pdev;
 	struct ocrdma_mqe_sge *mqe_sge = cmd.u.nonemb_req.sge;
 

Signature · 6 lines

2.12.0

--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

From: Markus Elfring <[email protected]>
Date: Tue, 7 Mar 2017 19:40:31 +0100

Replace the specification of a data structure by a pointer dereference as the parameter for the operator "sizeof" to make the corresponding size determination a bit safer according to the Linux coding style convention.

Signed-off-by Markus Elfring <[email protected]>

---
 drivers/infiniband/hw/ocrdma/ocrdma_hw.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

drivers/infiniband/hw/ocrdma/ocrdma_hw.c +0 -0

index 517a18e9351a..8122a1c7d2ae 100644

2.12.0

--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html

From: Markus Elfring <[email protected]>
Date: Tue, 7 Mar 2017 20:07:25 +0100

Replace the specification of a data structure by a pointer dereference as the parameter for the operator "sizeof" to make the corresponding size determination a bit safer according to the Linux coding style convention.

Signed-off-by Markus Elfring <[email protected]>

---
 drivers/infiniband/hw/ocrdma/ocrdma_hw.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

drivers/infiniband/hw/ocrdma/ocrdma_hw.c +0 -0

index 56f29e06dfe4..1f7d88d7569e 100644

Signature · 6 lines

2.12.0

--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

From: Markus Elfring <[email protected]>
Date: Tue, 7 Mar 2017 20:16:16 +0100

Replace the specification of two data structures by pointer dereferences as the parameter for the operator "sizeof" to make the corresponding size determinations a bit safer according to the Linux coding style convention.

Signed-off-by Markus Elfring <[email protected]>

---
 drivers/infiniband/hw/ocrdma/ocrdma_hw.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

drivers/infiniband/hw/ocrdma/ocrdma_hw.c +0 -0

index 1f7d88d7569e..0628600bee56 100644

drivers/infiniband/hw/ocrdma/ocrdma_hw.c +0 -0

 	else
 		ocrdma_le32_to_cpu(req, dev->stats_mem.size);
 

Signature · 6 lines

2.12.0

--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

From: Markus Elfring <[email protected]>
Date: Tue, 7 Mar 2017 20:20:45 +0100

Replace the specification of a data structure by a pointer dereference as the parameter for the operator "sizeof" to make the corresponding size determination a bit safer according to the Linux coding style convention.

Signed-off-by Markus Elfring <[email protected]>

---
 drivers/infiniband/hw/ocrdma/ocrdma_hw.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

drivers/infiniband/hw/ocrdma/ocrdma_hw.c +0 -0

index 0628600bee56..7d1e1caa90de 100644

drivers/infiniband/hw/ocrdma/ocrdma_hw.c +0 -0

 	ocrdma_ring_cq_db(dev, dev->mq.cq.id, true, false, cqe_popped);

Signature · 6 lines

2.12.0

--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

From: Markus Elfring <[email protected]>
Date: Tue, 7 Mar 2017 20:33:29 +0100

Replace the specification of a data structure by a pointer dereference as the parameter for the operator "sizeof" to make the corresponding size determination a bit safer according to the Linux coding style convention.

Signed-off-by Markus Elfring <[email protected]>

---
 drivers/infiniband/hw/ocrdma/ocrdma_hw.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

drivers/infiniband/hw/ocrdma/ocrdma_hw.c +0 -0

index 7d1e1caa90de..aa32bc9f323d 100644

Signature · 6 lines

2.12.0

--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Quoted 17 lines · SF Markus Elfring

From: Markus Elfring <[email protected]>
Date: Tue, 7 Mar 2017 20:33:29 +0100

Replace the specification of a data structure by a pointer dereference as the parameter for the operator "sizeof" to make the corresponding size determination a bit safer according to the Linux coding style convention.

Signed-off-by Markus Elfring <[email protected]>

---
 drivers/infiniband/hw/ocrdma/ocrdma_hw.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

drivers/infiniband/hw/ocrdma/ocrdma_hw.c +0 -0

index 7d1e1caa90de..aa32bc9f323d 100644

drivers/infiniband/hw/ocrdma/ocrdma_hw.c static void *ocrdma_init_emb_mqe(u8 opcode, u32 cmd_len) · line 358

Quoted 8 lines

drivers/infiniband/hw/ocrdma/ocrdma_hw.c +1 -1

@@ -352,7 +352,7 @@ static void *ocrdma_init_emb_mqe(u8 opcode, u32 cmd_len)
 {
      struct ocrdma_mqe *mqe;
 
-     mqe = kzalloc(sizeof(struct ocrdma_mqe), GFP_KERNEL);
+     mqe = kzalloc(sizeof(*mqe), GFP_KERNEL);
      if (!mqe)
              return NULL;
      mqe->hdr.spcl_sge_cnt_emb |=

Reviewed-by Yuval Shaia <[email protected]>

Quoted 7 lines

--
2.12.0

--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html

From: Markus Elfring <[email protected]>
Date: Tue, 7 Mar 2017 21:12:56 +0100

Do not use curly brackets at some source code places where a single statement should be sufficient.

Signed-off-by Markus Elfring <[email protected]>

---
 drivers/infiniband/hw/ocrdma/ocrdma_hw.c | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

drivers/infiniband/hw/ocrdma/ocrdma_hw.c +0 -0

index aa32bc9f323d..d5b988b011d1 100644
@@ -1092,14 +1092,14 @@ static int ocrdma_mbx_cmd(struct ocrdma_dev *dev, struct ocrdma_mqe *mqe)
 	if (cqe_status || ext_status) {
 		pr_err("%s() cqe_status=0x%x, ext_status=0x%x,",
 		       __func__, cqe_status, ext_status);

drivers/infiniband/hw/ocrdma/ocrdma_hw.c +6 -7

 		status = ocrdma_get_mbx_cqe_errno(cqe_status);
 		goto mbx_err;
 	}

@@ -1600,10 +1600,9 @@ void ocrdma_alloc_pd_pool(struct ocrdma_dev *dev)
 		return;
 
 	status = ocrdma_mbx_alloc_pd_range(dev);
-	if (status) {
+	if (status)
 		pr_err("%s(%d) Unable to initialize PD pool, using default.\n",
 			 __func__, dev->id);
-	}
 }
 
 static void ocrdma_free_pd_pool(struct ocrdma_dev *dev)

@@ -2997,11 +2996,10 @@ static int ocrdma_parse_dcbxcfg_rsp(struct ocrdma_dev *dev, int ptype,
 					goto out;
 				}
 			}
-			if (slindx = OCRDMA_MAX_SERVICE_LEVEL_INDEX) {
+			if (slindx = OCRDMA_MAX_SERVICE_LEVEL_INDEX)
 				pr_info("%s ocrdma%d application priority not set for 0x%x protocol\n",
 					dev_name(&dev->nic_info.pdev->dev),
 					dev->id, proto);
-			}
 		}
 	}
 

@@ -3158,16 +3156,17 @@ static int ocrdma_modify_eqd(struct ocrdma_dev *dev, struct ocrdma_eq *eq,
 			     int num)
 {
 	int num_eqs, i = 0;
-	if (num > 8) {
+
+	if (num > 8)
 		while (num) {
 			num_eqs = min(num, 8);
 			ocrdma_mbx_modify_eqd(dev, &eq[i], num_eqs);
 			i += num_eqs;
 			num -= num_eqs;
 		}
-	} else {
+	else
 		ocrdma_mbx_modify_eqd(dev, eq, num);
-	}
+
 	return 0;
 }
 

Signature · 6 lines

2.12.0

--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

From: Markus Elfring <[email protected]>
Date: Tue, 7 Mar 2017 21:12:56 +0100

Do not use curly brackets at some source code places where a single statement should be sufficient.

Signed-off-by Markus Elfring <[email protected]>

---
 drivers/infiniband/hw/ocrdma/ocrdma_hw.c | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

drivers/infiniband/hw/ocrdma/ocrdma_hw.c +4 -6

index aa32bc9f323d..d5b988b011d1 100644
@@ -1092,14 +1092,14 @@ static int ocrdma_mbx_cmd(struct ocrdma_dev *dev, struct ocrdma_mqe *mqe)
        if (cqe_status || ext_status) {
                pr_err("%s() cqe_status=0x%x, ext_status=0x%x,",
                       __func__, cqe_status, ext_status);
-               if (rsp) {
+               if (rsp)
                        /* This is for embedded cmds. */
                        pr_err("opcode=0x%x, subsystem=0x%x\n",
                               (rsp->subsys_op & OCRDMA_MBX_RSP_OPCODE_MASK) >>
                                OCRDMA_MBX_RSP_OPCODE_SHIFT,
                                (rsp->subsys_op & OCRDMA_MBX_RSP_SUBSYS_MASK) >>
                                OCRDMA_MBX_RSP_SUBSYS_SHIFT);
-               }
+
                status = ocrdma_get_mbx_cqe_errno(cqe_status);
                goto mbx_err;
        }

@@ -1600,10 +1600,9 @@ void ocrdma_alloc_pd_pool(struct ocrdma_dev *dev)
                return;
 
        status = ocrdma_mbx_alloc_pd_range(dev);
-       if (status) {
+       if (status)
                pr_err("%s(%d) Unable to initialize PD pool, using default.\n",
                         __func__, dev->id);
-       }
 }
 
 static void ocrdma_free_pd_pool(struct ocrdma_dev *dev)

@@ -2997,11 +2996,10 @@ static int ocrdma_parse_dcbxcfg_rsp(struct ocrdma_dev *dev, int ptype,
                                        goto out;
                                }
                        }
-                       if (slindx == OCRDMA_MAX_SERVICE_LEVEL_INDEX) {
+                       if (slindx == OCRDMA_MAX_SERVICE_LEVEL_INDEX)
                                pr_info("%s ocrdma%d application priority not set for 0x%x protocol\n",
                                        dev_name(&dev->nic_info.pdev->dev),
                                        dev->id, proto);
-                       }
                }
        }
 

@@ -3158,16 +3156,17 @@ static int ocrdma_modify_eqd(struct ocrdma_dev *dev, struct ocrdma_eq *eq,
                             int num)
 {

drivers/infiniband/hw/ocrdma/ocrdma_hw.c +2 -3

-       } else {
+       else
                ocrdma_mbx_modify_eqd(dev, eq, num);
-       }
+
        return 0;
 }
 
--

2.12.0

From: Markus Elfring <[email protected]>
Date: Tue, 7 Mar 2017 21:32:22 +0100
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The script “checkpatch.pl“ pointed information out like the following.

Comparison to NULL could be written !…

Thus fix the affected source code places.

Signed-off-by Markus Elfring <[email protected]>

---
 drivers/infiniband/hw/ocrdma/ocrdma_hw.c | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

drivers/infiniband/hw/ocrdma/ocrdma_hw.c +10 -10

index d5b988b011d1..8c7f0b108a7f 100644
@@ -665,7 +665,7 @@ static void ocrdma_process_qpcat_error(struct ocrdma_dev *dev,
 	enum ib_qp_state new_ib_qps = IB_QPS_ERR;
 	enum ib_qp_state old_ib_qps;
 
-	if (qp = NULL)
+	if (!qp)
 		BUG();
 	ocrdma_qp_state_change(qp, new_ib_qps, &old_ib_qps);
 }

@@ -693,7 +693,7 @@ static void ocrdma_dispatch_ibevent(struct ocrdma_dev *dev,
 	if (cqe->qpvalid_qpid & OCRDMA_AE_MCQE_QPVALID) {
 		if (qpid < dev->attr.max_qp)
 			qp = dev->qp_tbl[qpid];
-		if (qp = NULL) {
+		if (!qp) {
 			pr_err("ocrdma%d:Async event - qpid %u is not valid\n",
 			       dev->id, qpid);
 			return;

@@ -703,7 +703,7 @@ static void ocrdma_dispatch_ibevent(struct ocrdma_dev *dev,
 	if (cqe->cqvalid_cqid & OCRDMA_AE_MCQE_CQVALID) {
 		if (cqid < dev->attr.max_cq)
 			cq = dev->cq_tbl[cqid];
-		if (cq = NULL) {
+		if (!cq) {
 			pr_err("ocrdma%d:Async event - cqid %u is not valid\n",
 			       dev->id, cqid);
 			return;

@@ -882,7 +882,7 @@ static int ocrdma_mq_cq_handler(struct ocrdma_dev *dev, u16 cq_id)
 
 	while (1) {
 		cqe = ocrdma_get_mcqe(dev);
-		if (cqe = NULL)
+		if (!cqe)
 			break;
 		ocrdma_le32_to_cpu(cqe, sizeof(*cqe));
 		cqe_popped += 1;

@@ -948,7 +948,7 @@ static void ocrdma_qp_buddy_cq_handler(struct ocrdma_dev *dev,
 	 * false - Check for RQ CQ
 	 */
 	bcq = _ocrdma_qp_buddy_cq_handler(dev, cq, true);
-	if (bcq = NULL)
+	if (!bcq)
 		bcq = _ocrdma_qp_buddy_cq_handler(dev, cq, false);
 	spin_unlock_irqrestore(&dev->flush_q_lock, flags);
 

@@ -969,7 +969,7 @@ static void ocrdma_qp_cq_handler(struct ocrdma_dev *dev, u16 cq_idx)
 		BUG();
 
 	cq = dev->cq_tbl[cq_idx];
-	if (cq = NULL)
+	if (!cq)
 		return;
 
 	if (cq->ibcq.comp_handler) {

@@ -1289,7 +1289,7 @@ int ocrdma_mbx_rdma_stats(struct ocrdma_dev *dev, bool reset)
 	int status;
 
 	old_stats = kmalloc(sizeof(*old_stats), GFP_KERNEL);
-	if (old_stats = NULL)
+	if (!old_stats)
 		return -ENOMEM;
 
 	memset(mqe, 0, sizeof(*mqe));

@@ -1676,12 +1676,12 @@ static int ocrdma_mbx_create_ah_tbl(struct ocrdma_dev *dev)
 	dev->av_tbl.pbl.va = dma_alloc_coherent(&pdev->dev, PAGE_SIZE,
 						&dev->av_tbl.pbl.pa,
 						GFP_KERNEL);
-	if (dev->av_tbl.pbl.va = NULL)
+	if (!dev->av_tbl.pbl.va)
 		goto mem_err;
 
 	dev->av_tbl.va = dma_alloc_coherent(&pdev->dev, dev->av_tbl.size,
 					    &pa, GFP_KERNEL);
-	if (dev->av_tbl.va = NULL)
+	if (!dev->av_tbl.va)
 		goto mem_err_ah;
 	dev->av_tbl.pa = pa;
 	dev->av_tbl.num_ah = max_ah;

@@ -1722,7 +1722,7 @@ static void ocrdma_mbx_delete_ah_tbl(struct ocrdma_dev *dev)
 	struct ocrdma_delete_ah_tbl *cmd;
 	struct pci_dev *pdev = dev->nic_info.pdev;
 
-	if (dev->av_tbl.va = NULL)
+	if (!dev->av_tbl.va)
 		return;
 
 	cmd = ocrdma_init_emb_mqe(OCRDMA_CMD_DELETE_AH_TBL, sizeof(*cmd));

Signature · 6 lines

2.12.0

--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

From: Markus Elfring <[email protected]>
Date: Tue, 7 Mar 2017 22:12:36 +0100

Replace the specification of a data structure by a pointer dereference as the parameter for the operator "sizeof" to make the corresponding size determination a bit safer according to the Linux coding style convention.

Signed-off-by Markus Elfring <[email protected]>

---
 drivers/infiniband/hw/ocrdma/ocrdma_main.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

drivers/infiniband/hw/ocrdma/ocrdma_main.c +0 -0

index 9caa4c564e34..c49b4491d4e7 100644

Signature · 6 lines

2.12.0

--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

From: Markus Elfring <[email protected]>
Date: Tue, 7 Mar 2017 22:23:17 +0100

Omit an extra message for a memory allocation failure in this function.

Link http://events.linuxfoundation.org/sites/events/files/slides/LCJ16-Refactor_Strings-WSang_0.pdf

Signed-off-by Markus Elfring <[email protected]>

---
 drivers/infiniband/hw/ocrdma/ocrdma_main.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

drivers/infiniband/hw/ocrdma/ocrdma_main.c +2 -4

index c49b4491d4e7..93113feeb2d5 100644
@@ -304,10 +304,9 @@ static struct ocrdma_dev *ocrdma_add(struct be_dev_info *dev_info)
        struct ocrdma_dev *dev;
 
        dev = (struct ocrdma_dev *)ib_alloc_device(sizeof(*dev));
-       if (!dev) {
-               pr_err("Unable to allocate ib device\n");
+       if (!dev)
                return NULL;
-       }
+
        dev->mbx_cmd = kzalloc(sizeof(struct ocrdma_mqe_emb_cmd), GFP_KERNEL);
        if (!dev->mbx_cmd)
                goto idr_err;
--

2.12.0

From: Markus Elfring <[email protected]>
Date: Tue, 7 Mar 2017 22:23:17 +0100

Omit an extra message for a memory allocation failure in this function.

Link http://events.linuxfoundation.org/sites/events/files/slides/LCJ16-Refactor_Strings-WSang_0.pdf

Signed-off-by Markus Elfring <[email protected]>

---
 drivers/infiniband/hw/ocrdma/ocrdma_main.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

drivers/infiniband/hw/ocrdma/ocrdma_main.c +0 -0

index c49b4491d4e7..93113feeb2d5 100644

drivers/infiniband/hw/ocrdma/ocrdma_main.c +0 -0

 	dev->mbx_cmd = kzalloc(sizeof(struct ocrdma_mqe_emb_cmd), GFP_KERNEL);
 	if (!dev->mbx_cmd)
 		goto idr_err;

Signature · 6 lines

2.12.0

--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

From: Markus Elfring <[email protected]>
Date: Tue, 7 Mar 2017 22:34:33 +0100

The script "checkpatch.pl" pointed information out like the following.

Comparison to NULL could be written "!dev->stag_arr".

Thus fix the affected source code place.

Signed-off-by Markus Elfring <[email protected]>

---
 drivers/infiniband/hw/ocrdma/ocrdma_main.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

drivers/infiniband/hw/ocrdma/ocrdma_main.c +1 -2

index 93113feeb2d5..fbf672c79d5f 100644
@@ -238,7 +238,7 @@ static int ocrdma_alloc_resources(struct ocrdma_dev *dev)
 
        dev->stag_arr = kcalloc(OCRDMA_MAX_STAG, sizeof(*dev->stag_arr),
                                GFP_KERNEL);
-       if (dev->stag_arr == NULL)
+       if (!dev->stag_arr)
                goto alloc_err;
 
        ocrdma_alloc_pd_pool(dev);
--

2.12.0

From: Markus Elfring <[email protected]>
Date: Tue, 7 Mar 2017 22:34:33 +0100

The script "checkpatch.pl" pointed information out like the following.

Comparison to NULL could be written "!dev->stag_arr".

Thus fix the affected source code place.

Signed-off-by Markus Elfring <[email protected]>

---
 drivers/infiniband/hw/ocrdma/ocrdma_main.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

drivers/infiniband/hw/ocrdma/ocrdma_main.c +0 -0

index 93113feeb2d5..fbf672c79d5f 100644

drivers/infiniband/hw/ocrdma/ocrdma_main.c +0 -0

 	ocrdma_alloc_pd_pool(dev);

Signature · 6 lines

2.12.0

--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

From: Markus Elfring <[email protected]>
Date: Wed, 8 Mar 2017 08:45:31 +0100

* A multiplication for the size determination of a memory allocation indicated that an array data structure should be processed. Thus use the corresponding function "kmalloc_array".

This issue was detected by using the Coccinelle software.

* Replace the specification of a data type by a pointer dereference to make the corresponding size determination a bit safer according to the Linux coding style convention.

Signed-off-by Markus Elfring <[email protected]>

---
 drivers/infiniband/hw/ocrdma/ocrdma_verbs.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

drivers/infiniband/hw/ocrdma/ocrdma_verbs.c +0 -0

index bc9fb144e57b..ef670ac1cbe9 100644

drivers/infiniband/hw/ocrdma/ocrdma_verbs.c +3 -1

+               srq->idx_bit_fields = kmalloc_array(srq->bit_fields_len,
+                                                   sizeof(*srq->idx_bit_fields),
+                                                   GFP_KERNEL);
                if (srq->idx_bit_fields == NULL)
                        goto arm_err;
                memset(srq->idx_bit_fields, 0xff,
--

2.12.0

From: Markus Elfring <[email protected]>
Date: Wed, 8 Mar 2017 09:19:47 +0100

* Multiplications for the size determination of memory allocations indicated that array data structures should be processed. Thus reuse the corresponding function "kcalloc".

This issue was detected by using the Coccinelle software.

* Replace the specification of data types by pointer dereferences to make the corresponding size determinations a bit safer according to the Linux coding style convention.

Signed-off-by Markus Elfring <[email protected]>

---
 drivers/infiniband/hw/ocrdma/ocrdma_verbs.c | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

drivers/infiniband/hw/ocrdma/ocrdma_verbs.c +9 -11

index ef670ac1cbe9..330617e1ef75 100644
@@ -879,9 +879,8 @@ static int ocrdma_build_pbl_tbl(struct ocrdma_dev *dev, struct ocrdma_hw_mr *mr)
        void *va;
        dma_addr_t pa;
 
-       mr->pbl_table = kzalloc(sizeof(struct ocrdma_pbl) *
-                               mr->num_pbls, GFP_KERNEL);
-
+       mr->pbl_table = kcalloc(mr->num_pbls, sizeof(*mr->pbl_table),
+                               GFP_KERNEL);
        if (!mr->pbl_table)
                return -ENOMEM;
 

@@ -1362,13 +1361,12 @@ static void ocrdma_set_qp_db(struct ocrdma_dev *dev, struct ocrdma_qp *qp,
 
 static int ocrdma_alloc_wr_id_tbl(struct ocrdma_qp *qp)
 {
-       qp->wqe_wr_id_tbl =
-           kzalloc(sizeof(*(qp->wqe_wr_id_tbl)) * qp->sq.max_cnt,
-                   GFP_KERNEL);
+       qp->wqe_wr_id_tbl = kcalloc(qp->sq.max_cnt, sizeof(*qp->wqe_wr_id_tbl),
+                                   GFP_KERNEL);
        if (qp->wqe_wr_id_tbl == NULL)
                return -ENOMEM;
-       qp->rqe_wr_id_tbl =
-           kzalloc(sizeof(u64) * qp->rq.max_cnt, GFP_KERNEL);
+       qp->rqe_wr_id_tbl = kcalloc(qp->rq.max_cnt, sizeof(*qp->rqe_wr_id_tbl),
+                                   GFP_KERNEL);
        if (qp->rqe_wr_id_tbl == NULL)
                return -ENOMEM;
 

@@ -1903,8 +1901,9 @@ struct ib_srq *ocrdma_create_srq(struct ib_pd *ibpd,
                goto err;
 
        if (udata == NULL) {
-               srq->rqe_wr_id_tbl = kzalloc(sizeof(u64) * srq->rq.max_cnt,
-                           GFP_KERNEL);
+               srq->rqe_wr_id_tbl = kcalloc(srq->rq.max_cnt,
+                                            sizeof(*srq->rqe_wr_id_tbl),
+                                            GFP_KERNEL);
                if (srq->rqe_wr_id_tbl == NULL)
                        goto arm_err;
 
--

2.12.0

--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html

From: Markus Elfring <[email protected]>
Date: Wed, 8 Mar 2017 09:54:42 +0100

Replace the specification of a data type by a pointer dereference as the parameter for the operator "sizeof" to make the corresponding size determination a bit safer according to the Linux coding style convention.

Signed-off-by Markus Elfring <[email protected]>

---
 drivers/infiniband/hw/ocrdma/ocrdma_verbs.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

drivers/infiniband/hw/ocrdma/ocrdma_verbs.c +1 -2

index 330617e1ef75..05d55d361cfe 100644
@@ -3030,7 +3030,7 @@ struct ib_mr *ocrdma_alloc_mr(struct ib_pd *ibpd,
        if (!mr)
                return ERR_PTR(-ENOMEM);
 
-       mr->pages = kcalloc(max_num_sg, sizeof(u64), GFP_KERNEL);
+       mr->pages = kcalloc(max_num_sg, sizeof(*mr->pages), GFP_KERNEL);
        if (!mr->pages) {
                status = -ENOMEM;
                goto pl_err;
--

2.12.0

--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html

From: Markus Elfring <[email protected]>
Date: Wed, 8 Mar 2017 09:54:42 +0100

Replace the specification of a data type by a pointer dereference as the parameter for the operator "sizeof" to make the corresponding size determination a bit safer according to the Linux coding style convention.

Signed-off-by Markus Elfring <[email protected]>

---
 drivers/infiniband/hw/ocrdma/ocrdma_verbs.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

drivers/infiniband/hw/ocrdma/ocrdma_verbs.c +0 -0

index 330617e1ef75..05d55d361cfe 100644

drivers/infiniband/hw/ocrdma/ocrdma_verbs.c +0 -0

 	if (!mr->pages) {
 		status = -ENOMEM;
 		goto pl_err;

Signature · 6 lines

2.12.0

--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

From: Markus Elfring <[email protected]>
Date: Wed, 8 Mar 2017 10:00:41 +0100

Delete an assignment for the local variable "status" in an if branch because the desired failure indication is already specified by a constant error code at the end.

Signed-off-by Markus Elfring <[email protected]>

---
 drivers/infiniband/hw/ocrdma/ocrdma_verbs.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

drivers/infiniband/hw/ocrdma/ocrdma_verbs.c +1 -4

index 05d55d361cfe..af8798fd35b1 100644
@@ -3031,10 +3031,8 @@ struct ib_mr *ocrdma_alloc_mr(struct ib_pd *ibpd,
                return ERR_PTR(-ENOMEM);
 
        mr->pages = kcalloc(max_num_sg, sizeof(*mr->pages), GFP_KERNEL);
-       if (!mr->pages) {
-               status = -ENOMEM;
+       if (!mr->pages)
                goto pl_err;
-       }
 
        status = ocrdma_get_pbl_info(dev, mr, max_num_sg);
        if (status)
--

2.12.0

From: Markus Elfring <[email protected]>
Date: Wed, 8 Mar 2017 10:00:41 +0100

Delete an assignment for the local variable "status" in an if branch because the desired failure indication is already specified by a constant error code at the end.

Signed-off-by Markus Elfring <[email protected]>

---
 drivers/infiniband/hw/ocrdma/ocrdma_verbs.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

drivers/infiniband/hw/ocrdma/ocrdma_verbs.c +0 -0

index 05d55d361cfe..af8798fd35b1 100644

drivers/infiniband/hw/ocrdma/ocrdma_verbs.c +0 -0

 	status = ocrdma_get_pbl_info(dev, mr, max_num_sg);
 	if (status)

Signature · 6 lines

2.12.0

--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

From: Markus Elfring <[email protected]>
Date: Wed, 8 Mar 2017 10:10:50 +0100

Replace the specification of a data type by a pointer dereference as the parameter for the operator "sizeof" to make the corresponding size determination a bit safer according to the Linux coding style convention.

Signed-off-by Markus Elfring <[email protected]>

---
 drivers/infiniband/hw/ocrdma/ocrdma_verbs.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

drivers/infiniband/hw/ocrdma/ocrdma_verbs.c +1 -2

index af8798fd35b1..bedc229be89d 100644
@@ -1915,7 +1915,7 @@ struct ib_srq *ocrdma_create_srq(struct ib_pd *ibpd,
                if (srq->idx_bit_fields == NULL)
                        goto arm_err;
                memset(srq->idx_bit_fields, 0xff,
-                      srq->bit_fields_len * sizeof(u32));
+                      srq->bit_fields_len * sizeof(*srq->idx_bit_fields));
        }
 
        if (init_attr->attr.srq_limit) {
--

2.12.0

From: Markus Elfring <[email protected]>
Date: Wed, 8 Mar 2017 10:10:50 +0100

Replace the specification of a data type by a pointer dereference as the parameter for the operator "sizeof" to make the corresponding size determination a bit safer according to the Linux coding style convention.

Signed-off-by Markus Elfring <[email protected]>

---
 drivers/infiniband/hw/ocrdma/ocrdma_verbs.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

drivers/infiniband/hw/ocrdma/ocrdma_verbs.c +0 -0

index af8798fd35b1..bedc229be89d 100644

drivers/infiniband/hw/ocrdma/ocrdma_verbs.c +0 -0

 	if (init_attr->attr.srq_limit) {

Signature · 6 lines

2.12.0

--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

From: Markus Elfring <[email protected]>
Date: Wed, 8 Mar 2017 10:48:24 +0100

Return constant integer values without storing them in the local variable "status".

Signed-off-by Markus Elfring <[email protected]>

---
 drivers/infiniband/hw/ocrdma/ocrdma_verbs.c | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

drivers/infiniband/hw/ocrdma/ocrdma_verbs.c +3 -7

index bedc229be89d..1d25512416f5 100644
@@ -1123,15 +1123,12 @@ struct ib_cq *ocrdma_create_cq(struct ib_device *ibdev,
 int ocrdma_resize_cq(struct ib_cq *ibcq, int new_cnt,
                     struct ib_udata *udata)
 {
-       int status = 0;
        struct ocrdma_cq *cq = get_ocrdma_cq(ibcq);
 
-       if (new_cnt < 1 || new_cnt > cq->max_hw_cqe) {
-               status = -EINVAL;
-               return status;
-       }
+       if (new_cnt < 1 || new_cnt > cq->max_hw_cqe)
+               return -EINVAL;
        ibcq->cqe = new_cnt;
-       return status;
+       return 0;
 }
 
 static void ocrdma_flush_cq(struct ocrdma_cq *cq)
--

2.12.0

From: Markus Elfring <[email protected]>
Date: Wed, 8 Mar 2017 10:48:24 +0100

Return constant integer values without storing them in the local variable "status".

Signed-off-by Markus Elfring <[email protected]>

---
 drivers/infiniband/hw/ocrdma/ocrdma_verbs.c | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

drivers/infiniband/hw/ocrdma/ocrdma_verbs.c +0 -1

index bedc229be89d..1d25512416f5 100644
@@ -1123,15 +1123,12 @@ struct ib_cq *ocrdma_create_cq(struct ib_device *ibdev,
 int ocrdma_resize_cq(struct ib_cq *ibcq, int new_cnt,
 		     struct ib_udata *udata)
 {
-	int status = 0;
 	struct ocrdma_cq *cq = get_ocrdma_cq(ibcq);

drivers/infiniband/hw/ocrdma/ocrdma_verbs.c +0 -0

 }
 
 static void ocrdma_flush_cq(struct ocrdma_cq *cq)

Signature · 6 lines

2.12.0

--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

From: Markus Elfring <[email protected]>
Date: Wed, 8 Mar 2017 10:58:34 +0100

1. Return zero in one case directly.

2. Return the value from a call of the function "_ocrdma_dealloc_pd" without using an extra assignment for the local variable.

3. Remove the variable "status" in this function then.

Signed-off-by Markus Elfring <[email protected]>

---
 drivers/infiniband/hw/ocrdma/ocrdma_verbs.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

drivers/infiniband/hw/ocrdma/ocrdma_verbs.c +2 -5

index 1d25512416f5..ae0d343d1731 100644
@@ -755,7 +755,6 @@ int ocrdma_dealloc_pd(struct ib_pd *ibpd)
        struct ocrdma_pd *pd = get_ocrdma_pd(ibpd);
        struct ocrdma_dev *dev = get_ocrdma_dev(ibpd->device);
        struct ocrdma_ucontext *uctx = NULL;
-       int status = 0;
        u64 usr_db;
 
        uctx = pd->uctx;

@@ -769,11 +768,10 @@ int ocrdma_dealloc_pd(struct ib_pd *ibpd)
 
                if (is_ucontext_pd(uctx, pd)) {
                        ocrdma_release_ucontext_pd(uctx);
-                       return status;
+                       return 0;
                }
        }
-       status = _ocrdma_dealloc_pd(dev, pd);
-       return status;
+       return _ocrdma_dealloc_pd(dev, pd);
 }
 
 static int ocrdma_alloc_lkey(struct ocrdma_dev *dev, struct ocrdma_mr *mr,
--

2.12.0

--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html

From: Markus Elfring <[email protected]>
Date: Wed, 8 Mar 2017 10:58:34 +0100

1. Return zero in one case directly.

2. Return the value from a call of the function "_ocrdma_dealloc_pd" without using an extra assignment for the local variable.

3. Remove the variable "status" in this function then.

Signed-off-by Markus Elfring <[email protected]>

---
 drivers/infiniband/hw/ocrdma/ocrdma_verbs.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

drivers/infiniband/hw/ocrdma/ocrdma_verbs.c +0 -1

index 1d25512416f5..ae0d343d1731 100644
@@ -755,7 +755,6 @@ int ocrdma_dealloc_pd(struct ib_pd *ibpd)
 	struct ocrdma_pd *pd = get_ocrdma_pd(ibpd);
 	struct ocrdma_dev *dev = get_ocrdma_dev(ibpd->device);
 	struct ocrdma_ucontext *uctx = NULL;
-	int status = 0;
 	u64 usr_db;
 
 	uctx = pd->uctx;

@@ -769,11 +768,10 @@ int ocrdma_dealloc_pd(struct ib_pd *ibpd)
 

drivers/infiniband/hw/ocrdma/ocrdma_verbs.c +0 -0

 static int ocrdma_alloc_lkey(struct ocrdma_dev *dev, struct ocrdma_mr *mr,

Signature · 6 lines

2.12.0

--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

From: Markus Elfring <[email protected]>
Date: Wed, 8 Mar 2017 11:11:35 +0100

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 <[email protected]>

---
 drivers/infiniband/hw/ocrdma/ocrdma_verbs.c | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

drivers/infiniband/hw/ocrdma/ocrdma_verbs.c +4 -7

index ae0d343d1731..d3cb8e2f099f 100644
@@ -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.0

From: Markus Elfring <[email protected]>
Date: Wed, 8 Mar 2017 11:11:35 +0100

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 <[email protected]>

---
 drivers/infiniband/hw/ocrdma/ocrdma_verbs.c | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

drivers/infiniband/hw/ocrdma/ocrdma_verbs.c +2 -3

index ae0d343d1731..d3cb8e2f099f 100644
@@ -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;

drivers/infiniband/hw/ocrdma/ocrdma_verbs.c +0 -0

 static int ocrdma_dealloc_ucontext_pd(struct ocrdma_ucontext *uctx)

Signature · 6 lines

2.12.0

--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

From: Markus Elfring <[email protected]>
Date: Wed, 8 Mar 2017 12:36:41 +0100

Do not use curly brackets at some source code places where a single statement should be sufficient.

Signed-off-by Markus Elfring <[email protected]>

---
 drivers/infiniband/hw/ocrdma/ocrdma_verbs.c | 41 +++++++++++------------------
 1 file changed, 16 insertions(+), 25 deletions(-)

drivers/infiniband/hw/ocrdma/ocrdma_verbs.c +13 -21

index d3cb8e2f099f..bfd86fd08847 100644
@@ -502,10 +502,10 @@ static int ocrdma_dealloc_ucontext_pd(struct ocrdma_ucontext *uctx)
 	struct ocrdma_pd *pd = uctx->cntxt_pd;
 	struct ocrdma_dev *dev = get_ocrdma_dev(pd->ibpd.device);
 
-	if (uctx->pd_in_use) {
+	if (uctx->pd_in_use)
 		pr_err("%s(%d) Freeing in use pdid=0x%x.\n",
 		       __func__, dev->id, pd->id);
-	}
+
 	uctx->cntxt_pd = NULL;
 	(void)_ocrdma_dealloc_pd(dev, pd);
 	return 0;

@@ -739,11 +739,10 @@ struct ib_pd *ocrdma_alloc_pd(struct ib_device *ibdev,
 	return &pd->ibpd;
 
 err:
-	if (is_uctx_pd) {
+	if (is_uctx_pd)
 		ocrdma_release_ucontext_pd(uctx);
-	} else {
+	else
 		status = _ocrdma_dealloc_pd(dev, pd);
-	}
 exit:
 	return ERR_PTR(status);
 }

@@ -1018,10 +1017,10 @@ int ocrdma_dereg_mr(struct ib_mr *ib_mr)
 	kfree(mr);
 
 	/* Don't stop cleanup, in case FW is unresponsive */
-	if (dev->mqe_ctx.fw_error_state) {
+	if (dev->mqe_ctx.fw_error_state)
 		pr_err("%s(%d) fw not responding.\n",
 		       __func__, dev->id);
-	}
+
 	return 0;
 }
 

@@ -1410,10 +1409,10 @@ struct ib_qp *ocrdma_create_qp(struct ib_pd *ibpd,
 		goto gen_err;
 
 	memset(&ureq, 0, sizeof(ureq));
-	if (udata) {
+	if (udata)
 		if (ib_copy_from_udata(&ureq, udata, sizeof(ureq)))
 			return ERR_PTR(-EFAULT);
-	}
+
 	qp = kzalloc(sizeof(*qp), GFP_KERNEL);
 	if (!qp) {
 		status = -ENOMEM;

@@ -2829,15 +2828,11 @@ static bool ocrdma_poll_rcqe(struct ocrdma_qp *qp, struct ocrdma_cqe *cqe,
 	bool expand = false;
 
 	ibwc->wc_flags = 0;
-	if (qp->qp_type = IB_QPT_UD || qp->qp_type = IB_QPT_GSI) {
-		status = (le32_to_cpu(cqe->flags_status_srcqpn) &
-					OCRDMA_CQE_UD_STATUS_MASK) >>
-					OCRDMA_CQE_UD_STATUS_SHIFT;
-	} else {
-		status = (le32_to_cpu(cqe->flags_status_srcqpn) &
-			     OCRDMA_CQE_STATUS_MASK) >> OCRDMA_CQE_STATUS_SHIFT;
-	}
-
+	status = (qp->qp_type = IB_QPT_UD || qp->qp_type = IB_QPT_GSI)
+		 ? ((le32_to_cpu(cqe->flags_status_srcqpn) &
+		    OCRDMA_CQE_UD_STATUS_MASK) >> OCRDMA_CQE_UD_STATUS_SHIFT)
+		 : ((le32_to_cpu(cqe->flags_status_srcqpn) &
+		    OCRDMA_CQE_STATUS_MASK) >> OCRDMA_CQE_STATUS_SHIFT);
 	if (status = OCRDMA_CQE_SUCCESS) {
 		*polled = true;
 		ocrdma_poll_success_rcqe(qp, cqe, ibwc);

@@ -2885,13 +2880,9 @@ static int ocrdma_poll_hwcq(struct ocrdma_cq *cq, int num_entries,
 		qp = dev->qp_tbl[qpn];
 		BUG_ON(qp = NULL);
 
-		if (is_cqe_for_sq(cqe)) {
-			expand = ocrdma_poll_scqe(qp, cqe, ibwc, &polled,
-						  &stop);

2.12.0

--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html

From: Markus Elfring <[email protected]>
Date: Wed, 8 Mar 2017 12:50:14 +0100
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The script “checkpatch.pl“ pointed information out like the following.

Comparison to NULL could be written !…

Thus fix affected source code places.

Signed-off-by Markus Elfring <[email protected]>

---
 drivers/infiniband/hw/ocrdma/ocrdma_verbs.c | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

drivers/infiniband/hw/ocrdma/ocrdma_verbs.c +10 -11

index bfd86fd08847..bd719e7f134e 100644
@@ -267,7 +267,7 @@ static int ocrdma_add_mmap(struct ocrdma_ucontext *uctx, u64 phy_addr,
        struct ocrdma_mm *mm;
 
        mm = kzalloc(sizeof(*mm), GFP_KERNEL);
-       if (mm == NULL)
+       if (!mm)
                return -ENOMEM;
        mm->key.phy_addr = phy_addr;
        mm->key.len = len;

@@ -1187,7 +1187,7 @@ static int ocrdma_add_qpn_map(struct ocrdma_dev *dev, struct ocrdma_qp *qp)
 {
        int status = -EINVAL;
 
-       if (qp->id < OCRDMA_MAX_QP && dev->qp_tbl[qp->id] == NULL) {
+       if (qp->id < OCRDMA_MAX_QP && !dev->qp_tbl[qp->id]) {
                dev->qp_tbl[qp->id] = qp;
                status = 0;
        }

@@ -1355,11 +1355,11 @@ static int ocrdma_alloc_wr_id_tbl(struct ocrdma_qp *qp)
 {
        qp->wqe_wr_id_tbl = kcalloc(qp->sq.max_cnt, sizeof(*qp->wqe_wr_id_tbl),
                                    GFP_KERNEL);
-       if (qp->wqe_wr_id_tbl == NULL)
+       if (!qp->wqe_wr_id_tbl)
                return -ENOMEM;
        qp->rqe_wr_id_tbl = kcalloc(qp->rq.max_cnt, sizeof(*qp->rqe_wr_id_tbl),
                                    GFP_KERNEL);
-       if (qp->rqe_wr_id_tbl == NULL)
+       if (!qp->rqe_wr_id_tbl)
                return -ENOMEM;
 
        return 0;

@@ -1419,7 +1419,7 @@ struct ib_qp *ocrdma_create_qp(struct ib_pd *ibpd,
                goto gen_err;
        }
        ocrdma_set_qp_init_params(qp, pd, attrs);
-       if (udata == NULL)
+       if (!udata)
                qp->cap_flags |= (OCRDMA_QP_MW_BIND | OCRDMA_QP_LKEY0 |
                                        OCRDMA_QP_FAST_REG);
 

@@ -1431,7 +1431,7 @@ struct ib_qp *ocrdma_create_qp(struct ib_pd *ibpd,
                goto mbx_err;
 
        /* user space QP's wr_id table are managed in library */
-       if (udata == NULL) {
+       if (!udata) {
                status = ocrdma_alloc_wr_id_tbl(qp);
                if (status)
                        goto map_err;

@@ -1892,11 +1892,11 @@ struct ib_srq *ocrdma_create_srq(struct ib_pd *ibpd,
        if (status)
                goto err;
 
-       if (udata == NULL) {
+       if (!udata) {
                srq->rqe_wr_id_tbl = kcalloc(srq->rq.max_cnt,
                                             sizeof(*srq->rqe_wr_id_tbl),
                                             GFP_KERNEL);
-               if (srq->rqe_wr_id_tbl == NULL)
+               if (!srq->rqe_wr_id_tbl)
                        goto arm_err;
 
                srq->bit_fields_len = (srq->rq.max_cnt / 32) +

@@ -1904,7 +1904,7 @@ struct ib_srq *ocrdma_create_srq(struct ib_pd *ibpd,
                srq->idx_bit_fields = kmalloc_array(srq->bit_fields_len,
                                                    sizeof(*srq->idx_bit_fields),
                                                    GFP_KERNEL);
-               if (srq->idx_bit_fields == NULL)
+               if (!srq->idx_bit_fields)
                        goto arm_err;
                memset(srq->idx_bit_fields, 0xff,
                       srq->bit_fields_len * sizeof(*srq->idx_bit_fields));

@@ -2878,7 +2878,7 @@ static int ocrdma_poll_hwcq(struct ocrdma_cq *cq, int num_entries,
                if (qpn == 0)
                        goto skip_cqe;
                qp = dev->qp_tbl[qpn];
-               BUG_ON(qp == NULL);
+               BUG_ON(!qp);
 
                expand = is_cqe_for_sq(cqe)
                         ? ocrdma_poll_scqe(qp, cqe, ibwc, &polled, &stop)
--

2.12.0

Acked-by Devesh Sharma <[email protected]>

Quoted 104 lines · SF Markus Elfring

From: Markus Elfring <[email protected]>
Date: Wed, 8 Mar 2017 12:50:14 +0100
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The script “checkpatch.pl“ pointed information out like the following.

Comparison to NULL could be written !…

Thus fix affected source code places.

Signed-off-by Markus Elfring <[email protected]>

---
 drivers/infiniband/hw/ocrdma/ocrdma_verbs.c | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

drivers/infiniband/hw/ocrdma/ocrdma_verbs.c +10 -11

index bfd86fd08847..bd719e7f134e 100644
@@ -267,7 +267,7 @@ static int ocrdma_add_mmap(struct ocrdma_ucontext *uctx, u64 phy_addr,
        struct ocrdma_mm *mm;
 
        mm = kzalloc(sizeof(*mm), GFP_KERNEL);
-       if (mm = NULL)
+       if (!mm)
                return -ENOMEM;
        mm->key.phy_addr = phy_addr;
        mm->key.len = len;

@@ -1187,7 +1187,7 @@ static int ocrdma_add_qpn_map(struct ocrdma_dev *dev, struct ocrdma_qp *qp)
 {
        int status = -EINVAL;
 
-       if (qp->id < OCRDMA_MAX_QP && dev->qp_tbl[qp->id] = NULL) {
+       if (qp->id < OCRDMA_MAX_QP && !dev->qp_tbl[qp->id]) {
                dev->qp_tbl[qp->id] = qp;
                status = 0;
        }

@@ -1355,11 +1355,11 @@ static int ocrdma_alloc_wr_id_tbl(struct ocrdma_qp *qp)
 {
        qp->wqe_wr_id_tbl = kcalloc(qp->sq.max_cnt, sizeof(*qp->wqe_wr_id_tbl),
                                    GFP_KERNEL);
-       if (qp->wqe_wr_id_tbl = NULL)
+       if (!qp->wqe_wr_id_tbl)
                return -ENOMEM;
        qp->rqe_wr_id_tbl = kcalloc(qp->rq.max_cnt, sizeof(*qp->rqe_wr_id_tbl),
                                    GFP_KERNEL);
-       if (qp->rqe_wr_id_tbl = NULL)
+       if (!qp->rqe_wr_id_tbl)
                return -ENOMEM;
 
        return 0;

@@ -1419,7 +1419,7 @@ struct ib_qp *ocrdma_create_qp(struct ib_pd *ibpd,
                goto gen_err;
        }
        ocrdma_set_qp_init_params(qp, pd, attrs);
-       if (udata = NULL)
+       if (!udata)
                qp->cap_flags |= (OCRDMA_QP_MW_BIND | OCRDMA_QP_LKEY0 |
                                        OCRDMA_QP_FAST_REG);
 

@@ -1431,7 +1431,7 @@ struct ib_qp *ocrdma_create_qp(struct ib_pd *ibpd,
                goto mbx_err;
 
        /* user space QP's wr_id table are managed in library */
-       if (udata = NULL) {
+       if (!udata) {
                status = ocrdma_alloc_wr_id_tbl(qp);
                if (status)
                        goto map_err;

@@ -1892,11 +1892,11 @@ struct ib_srq *ocrdma_create_srq(struct ib_pd *ibpd,
        if (status)
                goto err;
 
-       if (udata = NULL) {
+       if (!udata) {
                srq->rqe_wr_id_tbl = kcalloc(srq->rq.max_cnt,
                                             sizeof(*srq->rqe_wr_id_tbl),
                                             GFP_KERNEL);
-               if (srq->rqe_wr_id_tbl = NULL)
+               if (!srq->rqe_wr_id_tbl)
                        goto arm_err;
 
                srq->bit_fields_len = (srq->rq.max_cnt / 32) +

@@ -1904,7 +1904,7 @@ struct ib_srq *ocrdma_create_srq(struct ib_pd *ibpd,
                srq->idx_bit_fields = kmalloc_array(srq->bit_fields_len,
                                                    sizeof(*srq->idx_bit_fields),
                                                    GFP_KERNEL);
-               if (srq->idx_bit_fields = NULL)
+               if (!srq->idx_bit_fields)
                        goto arm_err;
                memset(srq->idx_bit_fields, 0xff,
                       srq->bit_fields_len * sizeof(*srq->idx_bit_fields));

@@ -2878,7 +2878,7 @@ static int ocrdma_poll_hwcq(struct ocrdma_cq *cq, int num_entries,
                if (qpn = 0)
                        goto skip_cqe;
                qp = dev->qp_tbl[qpn];
-               BUG_ON(qp = NULL);
+               BUG_ON(!qp);
 
                expand = is_cqe_for_sq(cqe)
                         ? ocrdma_poll_scqe(qp, cqe, ibwc, &polled, &stop)
--

Quoted 2 lines

2.12.0

--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html

From: Markus Elfring <[email protected]>
Date: Wed, 8 Mar 2017 13:14:56 +0100

Several update suggestions were taken into account from static source code analysis.

Markus Elfring (26):
  Use kcalloc() in ocrdma_create_eqs()
  Use kcalloc() in ocrdma_mbx_alloc_pd_range()
  Improve size determinations in ocrdma_mbx_get_dcbx_config() Delete unnecessary variable initialisations in ocrdma_mbx_get_dcbx_config()
  Improve another size determination in ocrdma_mbx_query_qp() Improve another size determination in ocrdma_alloc_pd_pool() Improve another size determination in ocrdma_mbx_get_ctrl_attribs() Improve size determinations in ocrdma_mbx_rdma_stats() Improve another size determination in ocrdma_mq_cq_handler() Improve another size determination in ocrdma_init_emb_mqe() Delete unnecessary braces
  Adjust ten checks for null pointers
  Use kcalloc() in ocrdma_alloc_resources()
  Improve another size determination in ocrdma_add() Delete an error message for a failed memory allocation in ocrdma_add()
  Adjust a null pointer check in ocrdma_alloc_resources() Use kmalloc_array() in ocrdma_create_srq()
  Use kcalloc() in three functions
  Improve another size determination in ocrdma_alloc_mr() Delete an unnecessary variable assignment in ocrdma_alloc_mr() Improve another size determination in ocrdma_create_srq() Returning only value constants in ocrdma_resize_cq() Delete an unnecessary variable in ocrdma_dealloc_pd() One jump label less in ocrdma_alloc_ucontext_pd()
  Delete unnecessary braces
  Adjust further ten checks for null pointers

 drivers/infiniband/hw/ocrdma/ocrdma_hw.c    |  88 ++++++++++------
-----
 drivers/infiniband/hw/ocrdma/ocrdma_main.c  |  19 +++-- drivers/infiniband/hw/ocrdma/ocrdma_verbs.c | 118 ++++++++++++----
------------

 3 files changed, 100 insertions(+), 125 deletions(-)

From: Markus Elfring <[email protected]>
Date: Sat, 22 Apr 2017 11:33:25 +0200

* Multiplications for the size determination of memory allocations indicated that array data structures should be processed. Thus reuse the corresponding function "kcalloc".

This issue was detected by using the Coccinelle software.

* Delete the local variable "pd_bitmap_size" which became unnecessary with this refactoring.

Signed-off-by Markus Elfring <[email protected]>

---
 drivers/infiniband/hw/ocrdma/ocrdma_hw.c | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

drivers/infiniband/hw/ocrdma/ocrdma_hw.c +8 -9

index aa6967197620..c868314222b9 100644
@@ -1505,7 +1505,6 @@ int ocrdma_mbx_dealloc_pd(struct ocrdma_dev *dev, struct ocrdma_pd *pd)
 static int ocrdma_mbx_alloc_pd_range(struct ocrdma_dev *dev)
 {
        int status = -ENOMEM;
-       size_t pd_bitmap_size;
        struct ocrdma_alloc_pd_range *cmd;
        struct ocrdma_alloc_pd_range_rsp *rsp;
 

@@ -1527,10 +1526,10 @@ static int ocrdma_mbx_alloc_pd_range(struct ocrdma_dev *dev)
                        dev->pd_mgr->pd_dpp_start = rsp->dpp_page_pdid &
                                        OCRDMA_ALLOC_PD_RNG_RSP_START_PDID_MASK;
                        dev->pd_mgr->max_dpp_pd = rsp->pd_count;
-                       pd_bitmap_size =
-                               BITS_TO_LONGS(rsp->pd_count) * sizeof(long);
-                       dev->pd_mgr->pd_dpp_bitmap = kzalloc(pd_bitmap_size,
-                                                            GFP_KERNEL);
+                       dev->pd_mgr->pd_dpp_bitmap
+                               = kcalloc(BITS_TO_LONGS(rsp->pd_count),
+                                                       sizeof(long),
+                                                       GFP_KERNEL);
                }
                kfree(cmd);
        }

@@ -1546,9 +1545,10 @@ static int ocrdma_mbx_alloc_pd_range(struct ocrdma_dev *dev)
                dev->pd_mgr->pd_norm_start = rsp->dpp_page_pdid &
                                        OCRDMA_ALLOC_PD_RNG_RSP_START_PDID_MASK;
                dev->pd_mgr->max_normal_pd = rsp->pd_count;
-               pd_bitmap_size = BITS_TO_LONGS(rsp->pd_count) * sizeof(long);
-               dev->pd_mgr->pd_norm_bitmap = kzalloc(pd_bitmap_size,
-                                                     GFP_KERNEL);
+               dev->pd_mgr->pd_norm_bitmap
+                       = kcalloc(BITS_TO_LONGS(rsp->pd_count),
+                                               sizeof(long),
+                                               GFP_KERNEL);
        }
        kfree(cmd);
 
--

2.12.2

--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html

Acked-by Devesh Sharma <[email protected]>

Hello,

How will the clarification be continued for the shown change possibilities?

Regards,
Markus