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 <sunil.m@techveda.org>
Subject: [PATCH 1/3] staging: ccree: Replace kzalloc with devm_kzalloc
Date: Sat, 15 Jul 2017 13:21:54 +0530 [thread overview]
Message-ID: <1500105116-30290-2-git-send-email-sunil.m@techveda.org> (raw)
In-Reply-To: <1500105116-30290-1-git-send-email-sunil.m@techveda.org>
From: Suniel Mahesh <sunil.m@techveda.org>
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 <sunil.m@techveda.org>
---
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);
}
--
1.9.1
next prev parent reply other threads:[~2017-07-15 7:52 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-07-15 7:51 [PATCH 0/3] staging: ccree: Employ devm_* functions, remove redundant code sunil.m
2017-07-15 7:51 ` sunil.m [this message]
2017-07-17 12:33 ` [PATCH 1/3] staging: ccree: Replace kzalloc with devm_kzalloc Greg KH
2017-07-18 4:34 ` Suniel Mahesh
2017-07-18 10:58 ` [PATCH v2 " sunil.m
2017-07-18 10:58 ` [PATCH v2 2/3] staging: ccree: Convert to devm_ioremap_resource for map, unmap sunil.m
2017-07-18 10:58 ` [PATCH v2 3/3] staging: ccree: Use platform_get_irq and devm_request_irq sunil.m
2017-07-27 14:26 ` [PATCH v2 1/3] staging: ccree: Replace kzalloc with devm_kzalloc Gilad Ben-Yossef
2017-07-27 14:27 ` [PATCH " Gilad Ben-Yossef
2017-07-27 14:27 ` [PATCH 2/3] staging: ccree: Convert to devm_ioremap_resource for map, unmap Gilad Ben-Yossef
2017-07-27 19:48 ` Dan Carpenter
2017-07-28 4:29 ` Suniel Mahesh
2017-07-28 8:40 ` Dan Carpenter
2017-07-30 16:19 ` Gilad Ben-Yossef
2017-07-27 14:27 ` [PATCH 3/3] staging: ccree: Use platform_get_irq and devm_request_irq Gilad Ben-Yossef
2017-07-28 4:56 ` [PATCH 1/3] staging: ccree: Replace kzalloc with devm_kzalloc Greg Kroah-Hartman
2017-07-15 7:51 ` [PATCH 2/3] staging: ccree: Convert to devm_ioremap_resource for map, unmap sunil.m
2017-07-15 7:51 ` [PATCH 3/3] staging: ccree: Use platform_get_irq and devm_request_irq sunil.m
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1500105116-30290-2-git-send-email-sunil.m@techveda.org \
--to=sunil.m@techveda.org \
--cc=devel@driverdev.osuosl.org \
--cc=driverdev-devel@linuxdriverproject.org \
--cc=gilad@benyossef.com \
--cc=gregkh@linuxfoundation.org \
--cc=karthik@techveda.org \
--cc=linux-crypto@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).