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>

diff --git a/drivers/crypto/caam/caamalg.c b/drivers/crypto/caam/caamalg.c
index 5f891254db73f92a80035adaab1213b110c11ce3..339277c7acb9b6b623c17b7fa46ad551ab145721 100644 (file)
--- 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__)": ",

diff --git a/drivers/crypto/caam/caamhash.c b/drivers/crypto/caam/caamhash.c
index 2d244e629ed2e514a9830bca1d99a7b064e2ecb0..0d9284ef96a856e64755c1820dd29aefda54bcc8 100644 (file)
--- a/drivers/crypto/caam/caamhash.c
+++ b/drivers/crypto/caam/caamhash.c
@@ -633,11 +633,8 @@ static void ahash_done(struct device *jrdev, u32 *desc, u32 err,
 
        edesc = (struct ahash_edesc *)((char *)desc -
                 offsetof(struct ahash_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);
 
        ahash_unmap(jrdev, edesc, req, digestsize);
        kfree(edesc);
@@ -671,11 +668,8 @@ static void ahash_done_bi(struct device *jrdev, u32 *desc, u32 err,
 
        edesc = (struct ahash_edesc *)((char *)desc -
                 offsetof(struct ahash_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);
 
        ahash_unmap_ctx(jrdev, edesc, req, ctx->ctx_len, DMA_BIDIRECTIONAL);
        kfree(edesc);
@@ -709,11 +703,8 @@ static void ahash_done_ctx_src(struct device *jrdev, u32 *desc, u32 err,
 
        edesc = (struct ahash_edesc *)((char *)desc -
                 offsetof(struct ahash_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);
 
        ahash_unmap_ctx(jrdev, edesc, req, digestsize, DMA_FROM_DEVICE);
        kfree(edesc);
@@ -747,11 +738,8 @@ static void ahash_done_ctx_dst(struct device *jrdev, u32 *desc, u32 err,
 
        edesc = (struct ahash_edesc *)((char *)desc -
                 offsetof(struct ahash_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);
 
        ahash_unmap_ctx(jrdev, edesc, req, ctx->ctx_len, DMA_TO_DEVICE);
        kfree(edesc);

diff --git a/drivers/crypto/caam/caamrng.c b/drivers/crypto/caam/caamrng.c
index 3529b54048c9bfefb181198a44d06b1174f1331a..8c07d3153f125df158301f0e13226c597b2babc8 100644 (file)
--- a/drivers/crypto/caam/caamrng.c
+++ b/drivers/crypto/caam/caamrng.c
@@ -103,11 +103,8 @@ static void rng_done(struct device *jrdev, u32 *desc, u32 err, void *context)
        bd = (struct buf_data *)((char *)desc -
              offsetof(struct buf_data, 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);
 
        atomic_set(&bd->empty, BUF_NOT_EMPTY);
        complete(&bd->filled);

diff --git a/drivers/crypto/caam/error.c b/drivers/crypto/caam/error.c
index 9f25f5296029aeb0a22e0caf81bf35ca41b00063..ba426d9027831bf3b3697c097c75fdc0a6057a5f 100644 (file)
--- a/drivers/crypto/caam/error.c
+++ b/drivers/crypto/caam/error.c
@@ -243,8 +243,9 @@ static void report_cond_code_status(u32 status, char *outstr)
        SPRINTFCAT(outstr, "%s() not implemented", __func__, sizeof(__func__));
 }
 
-char *caam_jr_strstatus(char *outstr, u32 status)
+void caam_jr_strstatus(struct device *jrdev, u32 status)
 {
+       char outstr[CAAM_ERROR_STR_MAX];
        static const struct stat_src {
                void (*report_ssed)(u32 status, char *outstr);
                char *error;
@@ -265,6 +266,6 @@ char *caam_jr_strstatus(char *outstr, u32 status)
        if (status_src[ssrc].report_ssed)
                status_src[ssrc].report_ssed(status, outstr);
 
-       return outstr;
+       dev_err(jrdev, "%08x: %s\n", status, outstr);
 }
 EXPORT_SYMBOL(caam_jr_strstatus);

diff --git a/drivers/crypto/caam/error.h b/drivers/crypto/caam/error.h
index 02c7baa1748e44ed7da80074ba34bcb86d8e60c8..b6350b0d91539023d98064015ff1ff2dc3a2a5bf 100644 (file)
--- a/drivers/crypto/caam/error.h
+++ b/drivers/crypto/caam/error.h
@@ -7,5 +7,5 @@
 #ifndef CAAM_ERROR_H
 #define CAAM_ERROR_H
 #define CAAM_ERROR_STR_MAX 302
-extern char *caam_jr_strstatus(char *outstr, u32 status);
+void caam_jr_strstatus(struct device *jrdev, u32 status);
 #endif /* CAAM_ERROR_H */

diff --git a/drivers/crypto/caam/key_gen.c b/drivers/crypto/caam/key_gen.c
index ea2e406610ebf9450008f2e2baf9ee65be0839a0..871703c49d2c09923d162af7651518d46a5ff3a4 100644 (file)
--- a/drivers/crypto/caam/key_gen.c
+++ b/drivers/crypto/caam/key_gen.c
@@ -19,11 +19,8 @@ void split_key_done(struct device *dev, u32 *desc, u32 err,
        dev_err(dev, "%s %d: err 0x%x\n", __func__, __LINE__, err);
 #endif
 
-       if (err) {
-               char tmp[CAAM_ERROR_STR_MAX];
-
-               dev_err(dev, "%08x: %s\n", err, caam_jr_strstatus(tmp, err));
-       }
+       if (err)
+               caam_jr_strstatus(dev, err);
 
        res->err = err;