From patchwork Sat Jul 15 07:51:54 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Suniel Mahesh X-Patchwork-Id: 9842159 X-Patchwork-Delegate: herbert@gondor.apana.org.au Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id BEBDE60212 for ; Sat, 15 Jul 2017 07:52:28 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id AE2712876E for ; Sat, 15 Jul 2017 07:52:28 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A31362878F; Sat, 15 Jul 2017 07:52:28 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.4 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2B3302876E for ; Sat, 15 Jul 2017 07:52:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751177AbdGOHwQ (ORCPT ); Sat, 15 Jul 2017 03:52:16 -0400 Received: from mail-pg0-f65.google.com ([74.125.83.65]:33787 "EHLO mail-pg0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751130AbdGOHwP (ORCPT ); Sat, 15 Jul 2017 03:52:15 -0400 Received: by mail-pg0-f65.google.com with SMTP id 123so1426563pgd.0 for ; Sat, 15 Jul 2017 00:52:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=techveda-org.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=CJl/Bel2WPpSNqE1ej+1NMWKpTKqdOU+LJ8R42FTVTw=; b=CIFRxJnY8E3OXJj/t2eKPR6xSRcC0PSVadgbajBb8erv0XWksEARXKSSA07VA8ekCB w+y5HEBQjr4Mlo+wZxw4L+OhJSJm4aXfiHGEUWN04848NOdgVIGqSZ/bsj9+rKoDOFpm +vC7P/O0vdnqWwqcuOgWE2eYrdGeaFg1GbjQRSMWD2WGM69G82eQkp/Qwny7OBw47NHL CyPt1iWUkBjBZM+EnEz/kjqveL876NDmWv6Z8wK11uim/T+nwF47k68gVTpVP65SoqQi rW6YcJNv4BX6UR6xEyP0P+J6WHvd1V9hbcq0gyV27ApGwLex6YiYqaBEYgzSZCPZy2wq XD1g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=CJl/Bel2WPpSNqE1ej+1NMWKpTKqdOU+LJ8R42FTVTw=; b=gi7c8bJ04PHKcMTnuN62+PJbY8GofmtTF01f9m62jd02POV8/bu55KXfSTRlXjHR2s BAnKHevw6A0p4rw3hbVJwU2MtcFlNfJh24TVRIiD62bayzZchmsY0uLDMIFK/gUYiO2N q7NBXmrGVBttminrAv8JBK8Fk0CPbZ0HwitfC9SeKp0Nm3ngsIYDiFGUyyzzTdTC1hNm gpaDZ5vQMyDvfHrQEn/r1bfXbPIB9dGUQAs0QPjIGXP70ZdXCtAGTF0IETeLK1ww1so6 d6Rm5O/DiVFE9JqjPANKls6i86MOEXRKlJWuW94AFQyVE8t5YXjbInrppFrWUuQea9xA VkRw== X-Gm-Message-State: AIVw111tBl9E1JH5heFJY2J4pZ7uFCvcIkkQgNU/6kIciEJEfT+d/KNp FgbvmoxeF/bEbWUg X-Received: by 10.98.211.140 with SMTP id z12mr9327316pfk.231.1500105134823; Sat, 15 Jul 2017 00:52:14 -0700 (PDT) Received: from localhost.localdomain ([124.123.42.5]) by smtp.gmail.com with ESMTPSA id t26sm19195412pfl.41.2017.07.15.00.52.11 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sat, 15 Jul 2017 00:52:13 -0700 (PDT) From: sunil.m@techveda.org To: gregkh@linuxfoundation.org, gilad@benyossef.com Cc: linux-crypto@vger.kernel.org, driverdev-devel@linuxdriverproject.org, devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org, karthik@techveda.org, Suniel Mahesh Subject: [PATCH 1/3] staging: ccree: Replace kzalloc with devm_kzalloc Date: Sat, 15 Jul 2017 13:21:54 +0530 Message-Id: <1500105116-30290-2-git-send-email-sunil.m@techveda.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1500105116-30290-1-git-send-email-sunil.m@techveda.org> References: <1500105116-30290-1-git-send-email-sunil.m@techveda.org> Sender: linux-crypto-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-crypto@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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 --- Note: - Patch was tested and built(ARCH=arm) on next-20170714. No build issues reported, however it was not tested on real hardware. --- drivers/staging/ccree/ssi_driver.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/drivers/staging/ccree/ssi_driver.c b/drivers/staging/ccree/ssi_driver.c index 78709b92..f231ecf 100644 --- a/drivers/staging/ccree/ssi_driver.c +++ b/drivers/staging/ccree/ssi_driver.c @@ -224,13 +224,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(struct ssi_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(struct ssi_drvdata), + GFP_KERNEL); + if (!new_drvdata) { SSI_LOG_ERR("Failed to allocate drvdata"); rc = -ENOMEM; goto init_cc_res_err; @@ -431,10 +433,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; } @@ -475,8 +475,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); }