| Message ID | 1500105116-30290-2-git-send-email-sunil.m@techveda.org (mailing list archive) |
|---|---|
| State | Not Applicable |
| Delegated to: | Herbert Xu |
| Headers | show |
On Sat, Jul 15, 2017 at 01:21:54PM +0530, sunil.m@techveda.org wrote: > 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), sizeof(*new_drvdata), right? thanks, greg k-h
On Monday 17 July 2017 06:03 PM, Greg KH wrote: > On Sat, Jul 15, 2017 at 01:21:54PM +0530, sunil.m@techveda.org wrote: >> 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), > > sizeof(*new_drvdata), right? > Yes, sending v2 in a while. Thanks for the review suniel > thanks, > > greg k-h >
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); }