crypto: jh7110 - Remove the use of dev_err_probe()

Logging messages that show some type of "out of memory" error are generally
unnecessary as there is a generic message and a stack dump done by the
memory subsystem. These messages generally increase kernel size without
much added value[1].

The dev_err_probe() doesn't do anything when error is '-ENOMEM'. Therefore,
remove the useless call to dev_err_probe(), and just return the value
instead.

[1]: https://lore.kernel.org/lkml/1402419340.30479.18.camel@joe-AO725/

Signed-off-by: Liao Yuanhong <liaoyuanhong@vivo.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

diff --git a/drivers/crypto/starfive/jh7110-aes.c b/drivers/crypto/starfive/jh7110-aes.c
index 86a1a1fa9f8f9f54c52d81aa91ced854d6aea7b8..426b24889af853a63cbe1c9850a205316418adb9 100644 (file)
--- a/drivers/crypto/starfive/jh7110-aes.c
+++ b/drivers/crypto/starfive/jh7110-aes.c
@@ -511,8 +511,7 @@ static int starfive_aes_map_sg(struct starfive_cryp_dev *cryp,
                     stsg = sg_next(stsg), dtsg = sg_next(dtsg)) {
                        src_nents = dma_map_sg(cryp->dev, stsg, 1, DMA_BIDIRECTIONAL);
                        if (src_nents == 0)
-                               return dev_err_probe(cryp->dev, -ENOMEM,
-                                                    "dma_map_sg error\n");
+                               return -ENOMEM;
 
                        dst_nents = src_nents;
                        len = min(sg_dma_len(stsg), remain);
@@ -528,13 +527,11 @@ static int starfive_aes_map_sg(struct starfive_cryp_dev *cryp,
                for (stsg = src, dtsg = dst;;) {
                        src_nents = dma_map_sg(cryp->dev, stsg, 1, DMA_TO_DEVICE);
                        if (src_nents == 0)
-                               return dev_err_probe(cryp->dev, -ENOMEM,
-                                                    "dma_map_sg src error\n");
+                               return -ENOMEM;
 
                        dst_nents = dma_map_sg(cryp->dev, dtsg, 1, DMA_FROM_DEVICE);
                        if (dst_nents == 0)
-                               return dev_err_probe(cryp->dev, -ENOMEM,
-                                                    "dma_map_sg dst error\n");
+                               return -ENOMEM;
 
                        len = min(sg_dma_len(stsg), sg_dma_len(dtsg));
                        len = min(len, remain);
@@ -669,8 +666,7 @@ static int starfive_aes_aead_do_one_req(struct crypto_engine *engine, void *areq
        if (cryp->assoclen) {
                rctx->adata = kzalloc(cryp->assoclen + AES_BLOCK_SIZE, GFP_KERNEL);
                if (!rctx->adata)
-                       return dev_err_probe(cryp->dev, -ENOMEM,
-                                            "Failed to alloc memory for adata");
+                       return -ENOMEM;
 
                if (sg_copy_to_buffer(req->src, sg_nents_for_len(req->src, cryp->assoclen),
                                      rctx->adata, cryp->assoclen) != cryp->assoclen)

diff --git a/drivers/crypto/starfive/jh7110-hash.c b/drivers/crypto/starfive/jh7110-hash.c
index 6cfe0238f615f829f3cd729336c080642ca7b2db..e6839c7bfb73accc09609ecf5e6adbc4113a0b6a 100644 (file)
--- a/drivers/crypto/starfive/jh7110-hash.c
+++ b/drivers/crypto/starfive/jh7110-hash.c
@@ -229,8 +229,7 @@ static int starfive_hash_one_request(struct crypto_engine *engine, void *areq)
        for_each_sg(rctx->in_sg, tsg, rctx->in_sg_len, i) {
                src_nents = dma_map_sg(cryp->dev, tsg, 1, DMA_TO_DEVICE);
                if (src_nents == 0)
-                       return dev_err_probe(cryp->dev, -ENOMEM,
-                                            "dma_map_sg error\n");
+                       return -ENOMEM;
 
                ret = starfive_hash_dma_xfer(cryp, tsg);
                dma_unmap_sg(cryp->dev, tsg, 1, DMA_TO_DEVICE);