crypto: caam - Contain caam_jr_strstatus() ugliness

The tentacles of this function were firmly attached to various
places in the CAAM code. Just cut them, or this cthulhu function
will sprout them anew.

Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Herbert Xu <herbert@gondor.apana.org.au>
Cc: Horia Geanta <horia.geanta@freescale.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

1 files changed, 8 insertions, 20 deletions

diff --git a/drivers/crypto/caam/caamalg.c b/drivers/crypto/caam/caamalg.c
index 5f891254db73..339277c7acb9 100644
--- a/drivers/crypto/caam/caamalg.c
+++ b/drivers/crypto/caam/caamalg.c
@@ -918,11 +918,8 @@ static void aead_encrypt_done(struct device *jrdev, u32 *desc, u32 err,
         edesc = (struct aead_edesc *)((char *)desc -
                  offsetof(struct aead_edesc, hw_desc));
 
-        if (err) {
-                char tmp[CAAM_ERROR_STR_MAX];
-
-                dev_err(jrdev, "%08x: %s\n", err, caam_jr_strstatus(tmp, err));
-        }
+        if (err)
+                caam_jr_strstatus(jrdev, err);
 
         aead_unmap(jrdev, edesc, req);
 
@@ -969,11 +966,8 @@ static void aead_decrypt_done(struct device *jrdev, u32 *desc, u32 err,
                        req->cryptlen - ctx->authsize, 1);
 #endif
 
-        if (err) {
-                char tmp[CAAM_ERROR_STR_MAX];
-
-                dev_err(jrdev, "%08x: %s\n", err, caam_jr_strstatus(tmp, err));
-        }
+        if (err)
+                caam_jr_strstatus(jrdev, err);
 
         aead_unmap(jrdev, edesc, req);
 
@@ -1018,11 +1012,8 @@ static void ablkcipher_encrypt_done(struct device *jrdev, u32 *desc, u32 err,
         edesc = (struct ablkcipher_edesc *)((char *)desc -
                  offsetof(struct ablkcipher_edesc, hw_desc));
 
-        if (err) {
-                char tmp[CAAM_ERROR_STR_MAX];
-
-                dev_err(jrdev, "%08x: %s\n", err, caam_jr_strstatus(tmp, err));
-        }
+        if (err)
+                caam_jr_strstatus(jrdev, err);
 
 #ifdef DEBUG
         print_hex_dump(KERN_ERR, "dstiv  @"__stringify(__LINE__)": ",
@@ -1053,11 +1044,8 @@ static void ablkcipher_decrypt_done(struct device *jrdev, u32 *desc, u32 err,
 
         edesc = (struct ablkcipher_edesc *)((char *)desc -
                  offsetof(struct ablkcipher_edesc, hw_desc));
-        if (err) {
-                char tmp[CAAM_ERROR_STR_MAX];
-
-                dev_err(jrdev, "%08x: %s\n", err, caam_jr_strstatus(tmp, err));
-        }
+        if (err)
+                caam_jr_strstatus(jrdev, err);
 
 #ifdef DEBUG
         print_hex_dump(KERN_ERR, "dstiv  @"__stringify(__LINE__)": ",