Skip to contentSkip to conversation

crypto: mxs-dcp: Use devm_kzalloc()

PATCH In review Fabio Estevam 3 participants 5 messages Jan 29, 2014 – Feb 9, 2014

Subsystems (2)
Arm i.MX and Layerscape Crypto API
lore
Share & tools
lore

Fabio Estevam

author reviewer
#0 lore raw

PATCH 1/2 crypto: mxs-dcp: Use devm_kzalloc()

From: Fabio Estevam <[email protected]>

Using devm_kzalloc() can make the code cleaner.

While at it, remove the devm_kzalloc error message as there is standard OOM message done by the core.

Signed-off-by Fabio Estevam <[email protected]>
---
 drivers/crypto/mxs-dcp.c | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)
drivers/crypto/mxs-dcp.c +2 -7
index a6db7fa..2d7d497 100644
@@ -935,9 +935,8 @@ static int mxs_dcp_probe(struct platform_device *pdev)
 	}
 
 	/* Allocate coherent helper block. */
-	sdcp->coh = kzalloc(sizeof(struct dcp_coherent_block), GFP_KERNEL);
+	sdcp->coh = devm_kzalloc(dev, sizeof(*sdcp->coh), GFP_KERNEL);
 	if (!sdcp->coh) {
-		dev_err(dev, "Error allocating coherent block\n");
 		ret = -ENOMEM;
 		goto err_mutex;
 	}

@@ -982,7 +981,7 @@ static int mxs_dcp_probe(struct platform_device *pdev)
 	if (IS_ERR(sdcp->thread[DCP_CHAN_HASH_SHA])) {
 		dev_err(dev, "Error starting SHA thread!\n");
 		ret = PTR_ERR(sdcp->thread[DCP_CHAN_HASH_SHA]);
-		goto err_free_coherent;
+		goto err_mutex;
 	}
 
 	sdcp->thread[DCP_CHAN_CRYPTO] = kthread_run(dcp_chan_thread_aes,

@@ -1040,8 +1039,6 @@ err_destroy_aes_thread:
 err_destroy_sha_thread:
 	kthread_stop(sdcp->thread[DCP_CHAN_HASH_SHA]);
 
-err_free_coherent:
-	kfree(sdcp->coh);
 err_mutex:
 	mutex_unlock(&global_mutex);
 	return ret;

@@ -1051,8 +1048,6 @@ static int mxs_dcp_remove(struct platform_device *pdev)
 {
 	struct dcp *sdcp = platform_get_drvdata(pdev);
 
-	kfree(sdcp->coh);
-
 	if (sdcp->caps & MXS_DCP_CAPABILITY1_SHA256)
 		crypto_unregister_ahash(&dcp_sha256_alg);
Signature · 1 line
1.8.1.2
author reviewer
#1 lore raw

PATCH 2/2 crypto: mxs-dcp: Check the return value of stmp_reset_block()

From: Fabio Estevam <[email protected]>

stmp_reset_block() may fail, so check its return value and propagate it in the case of error.

Signed-off-by Fabio Estevam <[email protected]>
---
 drivers/crypto/mxs-dcp.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/crypto/mxs-dcp.c +3 -1
index 2d7d497..4d18c40 100644
@@ -942,7 +942,9 @@ static int mxs_dcp_probe(struct platform_device *pdev)
 	}
 
 	/* Restart the DCP block. */
-	stmp_reset_block(sdcp->base);
+	ret = stmp_reset_block(sdcp->base);
+	if (ret)
+		goto err_mutex;
 
 	/* Initialize control register. */
 	writel(MXS_DCP_CTRL_GATHER_RESIDUAL_WRITES |
Signature · 1 line
1.8.1.2
maintainer
#4 lore raw
Quoted 11 lines · Marek Vasut
Quoted 8 lines · Fabio Estevam

From: Fabio Estevam <[email protected]>

Using devm_kzalloc() can make the code cleaner.

While at it, remove the devm_kzalloc error message as there is standard OOM message done by the core.

Signed-off-by Fabio Estevam <[email protected]>
Acked-by Marek Vasut <[email protected]>

Both patches applied.

Signature · 3 lines
Email: Herbert Xu <[email protected]>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt