diff options
| author | Marek Vasut <marex@denx.de> | 2014-04-24 20:05:17 +0200 |
|---|---|---|
| committer | Herbert Xu <herbert@gondor.apana.org.au> | 2014-05-08 21:58:09 +0800 |
| commit | 526243cc872398ed8139a52ee0bf7715a3abcf31 (patch) | |
| tree | 93467043b7b3848587e11813a8bb26d2b8ef4c7d /drivers/crypto | |
| parent | e75880dd9afb60ff59efe079ac50ccc16daffe54 (diff) | |
| download | linux-526243cc872398ed8139a52ee0bf7715a3abcf31.tar.gz | |
crypto: caam - Dissolve report_jump_idx()
Just dissolve this function so it's not in the way of applying further white magic cleanup down the line. 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>
Diffstat (limited to 'drivers/crypto')
| -rw-r--r-- | drivers/crypto/caam/error.c | 32 |
1 files changed, 17 insertions, 15 deletions
diff --git a/drivers/crypto/caam/error.c b/drivers/crypto/caam/error.c index a8736abd717d..aa7d5cf2a294 100644 --- a/drivers/crypto/caam/error.c +++ b/drivers/crypto/caam/error.c @@ -168,19 +168,6 @@ static const char * const rng_err_id_list[] = { kfree(tmp); \ } -static void report_jump_idx(u32 status, char *outstr) -{ - u8 idx = (status & JRSTA_DECOERR_INDEX_MASK) >> - JRSTA_DECOERR_INDEX_SHIFT; - - if (status & JRSTA_DECOERR_JUMP) - strcat(outstr, "jump tgt desc idx "); - else - strcat(outstr, "desc idx "); - - SPRINTFCAT(outstr, "%d: ", idx, sizeof("255")); -} - static void report_ccb_status(struct device *jrdev, u32 status, const char *error, char *__outstr) { @@ -189,10 +176,17 @@ static void report_ccb_status(struct device *jrdev, u32 status, u8 cha_id = (status & JRSTA_CCBERR_CHAID_MASK) >> JRSTA_CCBERR_CHAID_SHIFT; u8 err_id = status & JRSTA_CCBERR_ERRID_MASK; + u8 idx = (status & JRSTA_DECOERR_INDEX_MASK) >> + JRSTA_DECOERR_INDEX_SHIFT; sprintf(outstr, "%s: ", error); - report_jump_idx(status, outstr); + if (status & JRSTA_DECOERR_JUMP) + strcat(outstr, "jump tgt desc idx "); + else + strcat(outstr, "desc idx "); + + SPRINTFCAT(outstr, "%d: ", idx, sizeof("255")); if (cha_id < ARRAY_SIZE(cha_id_list)) { SPRINTFCAT(outstr, "%s: ", cha_id_list[cha_id], @@ -232,10 +226,18 @@ static void report_deco_status(struct device *jrdev, u32 status, char outstr[CAAM_ERROR_STR_MAX]; u8 desc_error = status & JRSTA_DECOERR_ERROR_MASK; + u8 idx = (status & JRSTA_DECOERR_INDEX_MASK) >> + JRSTA_DECOERR_INDEX_SHIFT; + int i; sprintf(outstr, "%s: ", error); - report_jump_idx(status, outstr); + if (status & JRSTA_DECOERR_JUMP) + strcat(outstr, "jump tgt desc idx "); + else + strcat(outstr, "desc idx "); + + SPRINTFCAT(outstr, "%d: ", idx, sizeof("255")); for (i = 0; i < ARRAY_SIZE(desc_error_list); i++) if (desc_error_list[i].value == desc_error) |