OSDN Git Service

crypto: ccree - use devm_kzalloc for device data
authorGilad Ben-Yossef <gilad@benyossef.com>
Thu, 18 Apr 2019 13:38:51 +0000 (16:38 +0300)
committerHerbert Xu <herbert@gondor.apana.org.au>
Thu, 25 Apr 2019 07:38:14 +0000 (15:38 +0800)
Move some remaining device data allocation to the safer devm_*
interface.

Signed-off-by: Gilad Ben-Yossef <gilad@benyossef.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
drivers/crypto/ccree/cc_fips.c
drivers/crypto/ccree/cc_sram_mgr.c

index b4d0a6d..9c03ab2 100644 (file)
@@ -49,8 +49,6 @@ void cc_fips_fini(struct cc_drvdata *drvdata)
 
        /* Kill tasklet */
        tasklet_kill(&fips_h->tasklet);
-
-       kfree(fips_h);
        drvdata->fips_handle = NULL;
 }
 
@@ -104,7 +102,7 @@ int cc_fips_init(struct cc_drvdata *p_drvdata)
        if (p_drvdata->hw_rev < CC_HW_REV_712)
                return 0;
 
-       fips_h = kzalloc(sizeof(*fips_h), GFP_KERNEL);
+       fips_h = devm_kzalloc(dev, sizeof(*fips_h), GFP_KERNEL);
        if (!fips_h)
                return -ENOMEM;
 
index c8c276f..8631978 100644 (file)
@@ -19,8 +19,7 @@ struct cc_sram_ctx {
  */
 void cc_sram_mgr_fini(struct cc_drvdata *drvdata)
 {
-       /* Free "this" context */
-       kfree(drvdata->sram_mgr_handle);
+       /* Nothing needed */
 }
 
 /**
@@ -48,7 +47,7 @@ int cc_sram_mgr_init(struct cc_drvdata *drvdata)
        }
 
        /* Allocate "this" context */
-       ctx = kzalloc(sizeof(*ctx), GFP_KERNEL);
+       ctx = devm_kzalloc(dev, sizeof(*ctx), GFP_KERNEL);
 
        if (!ctx)
                return -ENOMEM;