From patchwork Mon Dec 14 14:43:07 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicholas Mc Guire X-Patchwork-Id: 7845281 Return-Path: X-Original-To: patchwork-linux-rdma@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 67B4CBEEE1 for ; Mon, 14 Dec 2015 15:16:43 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 9CC3F203FB for ; Mon, 14 Dec 2015 15:16:39 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 7BD4C2034C for ; Mon, 14 Dec 2015 15:16:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751654AbbLNPQa (ORCPT ); Mon, 14 Dec 2015 10:16:30 -0500 Received: from www.osadl.org ([62.245.132.105]:43113 "EHLO www.osadl.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751814AbbLNPQa (ORCPT ); Mon, 14 Dec 2015 10:16:30 -0500 X-Greylist: delayed 1441 seconds by postgrey-1.27 at vger.kernel.org; Mon, 14 Dec 2015 10:16:25 EST Received: from debian.hofr.at (mail.osadl.at [92.243.35.153]) by www.osadl.org (8.13.8/8.13.8/OSADL-2007092901) with ESMTP id tBEEptah004914; Mon, 14 Dec 2015 15:51:55 +0100 From: Nicholas Mc Guire To: Mike Marciniszyn Cc: Doug Ledford , Sean Hefty , Hal Rosenstock , Greg Kroah-Hartman , linux-rdma@vger.kernel.org, devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org, Nicholas Mc Guire Subject: [PATCH 1/3] staging/rdma/hfi1: consolidate kmalloc_array+memset into kcalloc Date: Mon, 14 Dec 2015 15:43:07 +0100 Message-Id: <1450104189-2653-1-git-send-email-hofrat@osadl.org> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: References: X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org Sender: linux-rdma-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-rdma@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP rather than using kmalloc_array + memset it seems cleaner to simply use kcalloc which will deliver memory set to zero. Signed-off-by: Nicholas Mc Guire --- Patch was compile tested with: x86_64_defconfig CONFIG_INFINIBAND=m, CONFIG_STAGING=y, CONFIG_STAGING_RDMA=m Patch is against linux-next (localversion-next is -next-20151214) drivers/staging/rdma/hfi1/chip.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/staging/rdma/hfi1/chip.c b/drivers/staging/rdma/hfi1/chip.c index dc69159..31eec8a 100644 --- a/drivers/staging/rdma/hfi1/chip.c +++ b/drivers/staging/rdma/hfi1/chip.c @@ -10128,8 +10128,7 @@ static void init_qos(struct hfi1_devdata *dd, u32 first_ctxt) goto bail; if (num_vls * qpns_per_vl > dd->chip_rcv_contexts) goto bail; - rsmmap = kmalloc_array(NUM_MAP_REGS, sizeof(u64), GFP_KERNEL); - memset(rsmmap, rxcontext, NUM_MAP_REGS * sizeof(u64)); + rsmmap = kcalloc(NUM_MAP_REGS, sizeof(u64), GFP_KERNEL); /* init the local copy of the table */ for (i = 0, ctxt = first_ctxt; i < num_vls; i++) { unsigned tctxt;