crypto: ccree - use devm_kzalloc for device data

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>

diff --git a/drivers/crypto/ccree/cc_fips.c b/drivers/crypto/ccree/cc_fips.c
index b4d0a6d983e0cfe0c35653d3f087c36fc8090cf8..9c03ab238a7568c213b8fa67d2262b7fba4dce52 100644 (file)
--- a/drivers/crypto/ccree/cc_fips.c
+++ b/drivers/crypto/ccree/cc_fips.c
@@ -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;
 

diff --git a/drivers/crypto/ccree/cc_sram_mgr.c b/drivers/crypto/ccree/cc_sram_mgr.c
index c8c276f6dee9619dad7b6eef9049f7ed05d0ff17..86319788e390dddeeced8e05845dc9fd3f005090 100644 (file)
--- a/drivers/crypto/ccree/cc_sram_mgr.c
+++ b/drivers/crypto/ccree/cc_sram_mgr.c
@@ -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;