From patchwork Tue Aug 15 06:26:31 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gilad Ben-Yossef X-Patchwork-Id: 110091 Delivered-To: patch@linaro.org Received: by 10.182.109.195 with SMTP id hu3csp5114702obb; Mon, 14 Aug 2017 23:27:21 -0700 (PDT) X-Received: by 10.98.245.6 with SMTP id n6mr27264734pfh.113.1502778441268; Mon, 14 Aug 2017 23:27:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1502778441; cv=none; d=google.com; s=arc-20160816; b=cMvw/GUyYA+u+2gQUhLLrA+osL4aWd8uSijphLrn/SjmXWWy3vqdoLJFIA0jpwTtBA 1H1JCD0s/bjXnt/yVqmZDYjbnTAkbkWkKJAuumXDD4k3LgG0nSFjBcufde4FGi2Ux8bQ k7aDfpdcbSbK9lQtFTrONtQH4zjU/BZD8vqB0Sf858yCftlTeQhbpXQAOjBxpSo64DJ5 q/nUjqkFV9/oY7/irdW1hhFDyiSdK5AwAECbQzCeigixHytysGZDsPOg9KkBOTW5kmJK bHmnLlGhdE+8blGJlwJl8GaH5mvWHj3mNnLnuRM+8mg8tJLbQXPZM5IBCJmcKKfauxtT McNg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:arc-authentication-results; bh=M2qe8fGIxBNn/s3iNB6AP154lF75SILfnxymUYwiPDU=; b=llOPFzpArgXOPAc9rVuwi5Jv4bNij5C8Vlqoa4LKdkyR6g/fNdLe05tv+YcLXaUIcE EZTv/Ry4Uc+4GOraEJKsJSLkwOBWsVVbY9Q5XHCWf7HBxs6vgUx05xCQNySucEUo1i2a SN1aCL5nmqOi0AXjWimk2iXr0hgmNSj8dQZR2hLoHIlFgMLN9QnABgMPET0e4XfTOZzT 0dwSwxJBBKm1M1+X/p++me/WBY2oHm4WhbUvBvmaVADa3yIyenAhRCrOEJ8KOwmE33Wh It4L4R5VuyDBjx05Dp4eR9L7wx3Iez2WZfg2KeOkdqUct1ODV2AFySv0mw2vbtlKl2sp SsdA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id d14si5065087pgn.405.2017.08.14.23.27.20; Mon, 14 Aug 2017 23:27:21 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753268AbdHOG1T (ORCPT + 25 others); Tue, 15 Aug 2017 02:27:19 -0400 Received: from foss.arm.com ([217.140.101.70]:48044 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753071AbdHOG1Q (ORCPT ); Tue, 15 Aug 2017 02:27:16 -0400 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.72.51.249]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id EF3762B; Mon, 14 Aug 2017 23:27:15 -0700 (PDT) Received: from gby.kfn.arm.com (unknown [10.45.48.148]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 21D733F3E1; Mon, 14 Aug 2017 23:27:13 -0700 (PDT) From: Gilad Ben-Yossef To: Greg Kroah-Hartman , linux-crypto@vger.kernel.org, driverdev-devel@linuxdriverproject.org, devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org Cc: Ofir Drang , Suniel Mahesh Subject: [PATCH v3 03/22] staging: ccree: Replace kzalloc with devm_kzalloc Date: Tue, 15 Aug 2017 09:26:31 +0300 Message-Id: <1502778412-16255-4-git-send-email-gilad@benyossef.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1502778412-16255-1-git-send-email-gilad@benyossef.com> References: <1502778412-16255-1-git-send-email-gilad@benyossef.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Suniel Mahesh It is recommended to use managed function devm_kzalloc, which simplifies driver cleanup paths and driver code. This patch does the following: (a) replace kzalloc with devm_kzalloc. (b) drop kfree(), because memory allocated with devm_kzalloc() is automatically freed on driver detach, otherwise it leads to a double free. (c) remove unnecessary blank lines. Signed-off-by: Suniel Mahesh [gby: rebase on top of latest coding style fixes changes] Acked-by: Gilad Ben-Yossef --- drivers/staging/ccree/ssi_driver.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) -- 2.1.4 diff --git a/drivers/staging/ccree/ssi_driver.c b/drivers/staging/ccree/ssi_driver.c index 1cae2b7..97dfc2c 100644 --- a/drivers/staging/ccree/ssi_driver.c +++ b/drivers/staging/ccree/ssi_driver.c @@ -223,13 +223,15 @@ static int init_cc_resources(struct platform_device *plat_dev) struct resource *req_mem_cc_regs = NULL; void __iomem *cc_base = NULL; bool irq_registered = false; - struct ssi_drvdata *new_drvdata = kzalloc(sizeof(*new_drvdata), GFP_KERNEL); + struct ssi_drvdata *new_drvdata; struct device *dev = &plat_dev->dev; struct device_node *np = dev->of_node; u32 signature_val; int rc = 0; - if (unlikely(!new_drvdata)) { + new_drvdata = devm_kzalloc(&plat_dev->dev, sizeof(*new_drvdata), + GFP_KERNEL); + if (!new_drvdata) { SSI_LOG_ERR("Failed to allocate drvdata"); rc = -ENOMEM; goto init_cc_res_err; @@ -434,10 +436,8 @@ static int init_cc_resources(struct platform_device *plat_dev) resource_size(new_drvdata->res_mem)); new_drvdata->res_mem = NULL; } - kfree(new_drvdata); dev_set_drvdata(&plat_dev->dev, NULL); } - return rc; } @@ -478,8 +478,6 @@ static void cleanup_cc_resources(struct platform_device *plat_dev) drvdata->cc_base = NULL; drvdata->res_mem = NULL; } - - kfree(drvdata); dev_set_drvdata(&plat_dev->dev, NULL); }