Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 809487c7 authored by Amitoj Kaur Chawla's avatar Amitoj Kaur Chawla Committed by Greg Kroah-Hartman
Browse files

staging: rdma: hfi1: Use DIV_ROUND_UP 



The kernel.h macro DIV_ROUND_UP performs the computation
(((n) + (d) - 1) /(d)) but is perhaps more readable.

The Coccinelle script used is as follows:

// <smpl>
@@
expression n,d;
@@
(
- (n + d - 1) / d
+ DIV_ROUND_UP(n,d)
|
- (n + (d - 1)) / d
+ DIV_ROUND_UP(n,d)
)
@@
expression n,d;
@@
- DIV_ROUND_UP((n),d)
+ DIV_ROUND_UP(n,d)
@@
expression n,d;
@@
- DIV_ROUND_UP(n,(d))
+ DIV_ROUND_UP(n,d)
// </smpl>

Signed-off-by: default avatarAmitoj Kaur Chawla <amitoj1606@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 94b397cd

drivers/staging/rdma/hfi1/mr.c

+3 −3
Original line number Diff line number Diff line
@@ -70,7 +70,7 @@ static int init_mregion(struct hfi1_mregion *mr, struct ib_pd *pd, 
	int m, i = 0;

	int rval = 0;



	m = (count + HFI1_SEGSZ - 1) / HFI1_SEGSZ;

	m = DIV_ROUND_UP(count, HFI1_SEGSZ);

	for (; i < m; i++) {

		mr->map[i] = kzalloc(sizeof(*mr->map[0]), GFP_KERNEL);

		if (!mr->map[i])
@@ -159,7 +159,7 @@ static struct hfi1_mr *alloc_mr(int count, struct ib_pd *pd) 
	int m;



	/* Allocate struct plus pointers to first level page tables. */

	m = (count + HFI1_SEGSZ - 1) / HFI1_SEGSZ;

	m = DIV_ROUND_UP(count, HFI1_SEGSZ);

	mr = kzalloc(sizeof(*mr) + m * sizeof(mr->mr.map[0]), GFP_KERNEL);

	if (!mr)

		goto bail;
@@ -333,7 +333,7 @@ struct ib_fmr *hfi1_alloc_fmr(struct ib_pd *pd, int mr_access_flags, 
	int rval = -ENOMEM;



	/* Allocate struct plus pointers to first level page tables. */

	m = (fmr_attr->max_pages + HFI1_SEGSZ - 1) / HFI1_SEGSZ;

	m = DIV_ROUND_UP(fmr_attr->max_pages, HFI1_SEGSZ);

	fmr = kzalloc(sizeof(*fmr) + m * sizeof(fmr->mr.map[0]), GFP_KERNEL);

	if (!fmr)

		goto bail;