From patchwork Thu Mar 12 13:53:32 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Axel Lin X-Patchwork-Id: 449469 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id A234C1400DD for ; Fri, 13 Mar 2015 00:53:40 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754652AbbCLNxj (ORCPT ); Thu, 12 Mar 2015 09:53:39 -0400 Received: from mail-pd0-f170.google.com ([209.85.192.170]:38840 "EHLO mail-pd0-f170.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753749AbbCLNxj (ORCPT ); Thu, 12 Mar 2015 09:53:39 -0400 Received: by pdbfl12 with SMTP id fl12so20325648pdb.5 for ; Thu, 12 Mar 2015 06:53:38 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:message-id:subject:from:to:cc:date:in-reply-to :references:content-type:mime-version:content-transfer-encoding; bh=XG14SWo+87jV4Nx+Lvf8GFHaPwVpdiYA9AD0GE8fmGE=; b=F9WcPtgFi5Q8P+Tuhm2SqnwOf/JOkJBY8LcSu0yihoqO4felpzcu773/a8+aMsAhJt E1fuiTaI5gdZcXQhkhhIYZ45nBg5g1x/FWI5xv9vEXbuwy0ZXBBDaWWVNPiMfqA/EArT eKeMPgwVZWzpXTlNu3C6QdrlxNlIv51KyKsw4aCxECMZHfFXzg+6wqwHLnLvgmh3QxBL mr58GbfYHAgZhKM9hJU2hXAhedp3XhpPbpmihf5zAPStRUjgZ0F+5Mjre43IW4+JBtof uu+laCPjEv3yHVcZbQ3d/f9qvo64dqBP3sXJFcSQfApxqUx544As++iR7vqF31I1X0OM JslQ== X-Gm-Message-State: ALoCoQmKvBe+NLElqvrdTpm7Won/8Md8rN1KG2YqZQ3iGsIj3i1kp+lxQA/EhrxUZXxVTPfS63ip X-Received: by 10.66.149.163 with SMTP id ub3mr81947075pab.125.1426168418707; Thu, 12 Mar 2015 06:53:38 -0700 (PDT) Received: from [192.168.0.104] (218-164-101-226.dynamic.hinet.net. [218.164.101.226]) by mx.google.com with ESMTPSA id f12sm11183685pat.43.2015.03.12.06.53.35 (version=TLSv1.2 cipher=AES128-GCM-SHA256 bits=128/128); Thu, 12 Mar 2015 06:53:37 -0700 (PDT) Message-ID: <1426168412.30920.3.camel@phoenix> Subject: [PATCH 2/2] pinctrl: mediatek: mtk-common: Use devm_kcalloc at appropriate places From: Axel Lin To: Linus Walleij Cc: Matthias Brugger , Hongzhou Yang , Chaotian Jing , Yingjoe Chen , Maoguang Meng , "linux-gpio@vger.kernel.org" Date: Thu, 12 Mar 2015 21:53:32 +0800 In-Reply-To: <1426168353.30920.2.camel@phoenix> References: <1426168353.30920.2.camel@phoenix> X-Mailer: Evolution 3.10.4-0ubuntu2 Mime-Version: 1.0 Sender: linux-gpio-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-gpio@vger.kernel.org Prefer devm_kcalloc over devm_kzalloc with multiply. Signed-off-by: Axel Lin Acked-by: Hongzhou Yang --- drivers/pinctrl/mediatek/pinctrl-mtk-common.c | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/drivers/pinctrl/mediatek/pinctrl-mtk-common.c b/drivers/pinctrl/mediatek/pinctrl-mtk-common.c index f82f57a..493294c 100644 --- a/drivers/pinctrl/mediatek/pinctrl-mtk-common.c +++ b/drivers/pinctrl/mediatek/pinctrl-mtk-common.c @@ -1076,16 +1076,14 @@ static int mtk_pctrl_build_state(struct platform_device *pdev) pctl->ngroups = pctl->devdata->npins; /* Allocate groups */ - pctl->groups = devm_kzalloc(&pdev->dev, - pctl->ngroups * sizeof(*pctl->groups), - GFP_KERNEL); + pctl->groups = devm_kcalloc(&pdev->dev, pctl->ngroups, + sizeof(*pctl->groups), GFP_KERNEL); if (!pctl->groups) return -ENOMEM; /* We assume that one pin is one group, use pin name as group name. */ - pctl->grp_names = devm_kzalloc(&pdev->dev, - pctl->ngroups * sizeof(*pctl->grp_names), - GFP_KERNEL); + pctl->grp_names = devm_kcalloc(&pdev->dev, pctl->ngroups, + sizeof(*pctl->grp_names), GFP_KERNEL); if (!pctl->grp_names) return -ENOMEM; @@ -1152,8 +1150,7 @@ int mtk_pctrl_init(struct platform_device *pdev, return -EINVAL; } - pins = devm_kzalloc(&pdev->dev, - pctl->devdata->npins * sizeof(*pins), + pins = devm_kcalloc(&pdev->dev, pctl->devdata->npins, sizeof(*pins), GFP_KERNEL); if (!pins) return -ENOMEM; @@ -1211,8 +1208,8 @@ int mtk_pctrl_init(struct platform_device *pdev, goto chip_error; } - pctl->eint_dual_edges = devm_kzalloc(&pdev->dev, - sizeof(int) * pctl->devdata->ap_num, GFP_KERNEL); + pctl->eint_dual_edges = devm_kcalloc(&pdev->dev, pctl->devdata->ap_num, + sizeof(int), GFP_KERNEL); if (!pctl->eint_dual_edges) { ret = -ENOMEM; goto chip_error;