From patchwork Sun Jul 30 16:15:05 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: 108956 Delivered-To: patch@linaro.org Received: by 10.182.45.195 with SMTP id p3csp2747521obm; Sun, 30 Jul 2017 09:15:36 -0700 (PDT) X-Received: by 10.101.70.65 with SMTP id k1mr313900pgr.39.1501431336324; Sun, 30 Jul 2017 09:15:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1501431336; cv=none; d=google.com; s=arc-20160816; b=co/h2gDR1yLROwdleLAB91AbmbKpnHcd329slrkf9CGECzPIB9adVI7VdEjdGZnELK qIjK/Gz0U1oxWcJFcMFtk3DnaQjzjAAY9Ffl93Gy793saKmX86mcDX2MMSiSqyKbVrsQ HAferRXxfzh7HNyGQC0NaYcKvUGRh2OsbynunCsqmdMcE5xIM8Ixn0TljdVOn72Hnqki FJ6mRQudbnaU59ijiHY6wr01csN+zeSA3bvunJLV8hLcwmGGcWR/GUgiawX2otD9KwHo gA9Pr6u/WKhlva8GDSlOr8QPQlpovNQpJDxHeWNnUWIBUjMf0IkGh2mmDlXU6Eqg5AKX KjWA== 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=gmb5Kh9LPQ0cfeHXkBSegmU3qvIkbWdToIL9grqDLz4/BoX4GJ7YMT0PJT0tVyY7zu gLkTJQgQ6CEDZXsbbMYQQNIDtToy6HLJMNTN9aX85+kyOdCjiJnMdO/iM6jxNxhc8Ij3 JPvevU4UaDw4m/ScICQ38wxvQKR2lWuBtaMxSXEPNFdySRXiNUe/epeSd1b2Qyah3oCs RI+yp6rdaPa+oep0rA891o80F5wPnEZHRa3stvHphguY/eO8oCpJLijnv2zNATSzdJOA ScIWkvQBpnQ0MFJUMezZl52/C+gxbRmO6tQuqwMyBviw7RZO4PWkbNnyd41IGpISLhwr 30jQ== 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 o11si12587120pgq.683.2017.07.30.09.15.35; Sun, 30 Jul 2017 09:15:36 -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 S1754265AbdG3QP2 (ORCPT + 26 others); Sun, 30 Jul 2017 12:15:28 -0400 Received: from foss.arm.com ([217.140.101.70]:43004 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754243AbdG3QPY (ORCPT ); Sun, 30 Jul 2017 12:15:24 -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 5986913D5; Sun, 30 Jul 2017 09:15:24 -0700 (PDT) Received: from localhost.localdomain (usa-sjc-mx-foss1.foss.arm.com [217.140.101.70]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 5C9453F540; Sun, 30 Jul 2017 09:15:22 -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 v2 3/6] staging: ccree: Replace kzalloc with devm_kzalloc Date: Sun, 30 Jul 2017 19:15:05 +0300 Message-Id: <1501431309-27705-4-git-send-email-gilad@benyossef.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1501431309-27705-1-git-send-email-gilad@benyossef.com> References: <1501431309-27705-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); }