From: Markus Elfring Date: Fri, 10 Feb 2017 07:50:45 +0000 (+0100) Subject: IB/hfi1: Remove intermediate var in hfi1_user_sdma_alloc_queues() X-Git-Tag: MMI-PSA29.97-13-9~5649^3~151 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=e036c2006c77c750d0f553e1b484b029e231d7ee;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git IB/hfi1: Remove intermediate var in hfi1_user_sdma_alloc_queues() * Pass a product for a call of the function "vmalloc_user" without storing it in an intermediate variable. * Delete the local variable "memsize" which became unnecessary with this refactoring. Signed-off-by: Markus Elfring Signed-off-by: Doug Ledford --- diff --git a/drivers/infiniband/hw/hfi1/user_sdma.c b/drivers/infiniband/hw/hfi1/user_sdma.c index f00348147e3d..252f0c183d61 100644 --- a/drivers/infiniband/hw/hfi1/user_sdma.c +++ b/drivers/infiniband/hw/hfi1/user_sdma.c @@ -376,7 +376,6 @@ int hfi1_user_sdma_alloc_queues(struct hfi1_ctxtdata *uctxt, struct file *fp) { struct hfi1_filedata *fd; int ret = 0; - unsigned memsize; char buf[64]; struct hfi1_devdata *dd; struct hfi1_user_sdma_comp_q *cq; @@ -444,8 +443,8 @@ int hfi1_user_sdma_alloc_queues(struct hfi1_ctxtdata *uctxt, struct file *fp) if (!cq) goto cq_nomem; - memsize = PAGE_ALIGN(sizeof(*cq->comps) * hfi1_sdma_comp_ring_size); - cq->comps = vmalloc_user(memsize); + cq->comps = vmalloc_user(PAGE_ALIGN(sizeof(*cq->comps) + * hfi1_sdma_comp_ring_size)); if (!cq->comps) goto cq_comps_nomem;