diff options
author | Jan Glauber <jang@linux.vnet.ibm.com> | 2008-12-25 07:39:37 -0500 |
---|---|---|
committer | Martin Schwidefsky <schwidefsky@de.ibm.com> | 2008-12-25 07:39:20 -0500 |
commit | 39f09392498d8ee876bea3ad34f26c447924c818 (patch) | |
tree | c11ab3e96a4fb03b7467d9f49e7b2a63898ddf09 | |
parent | e6d5a428e01b1387852f17b3dd7934239a0be0d4 (diff) |
[S390] convert cpacf printks to pr_xxx macros.
Signed-off-by: Jan Glauber <jang@linux.vnet.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
-rw-r--r-- | arch/s390/crypto/aes_s390.c | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/arch/s390/crypto/aes_s390.c b/arch/s390/crypto/aes_s390.c index e33f32b54c08..c42cd898f68b 100644 --- a/arch/s390/crypto/aes_s390.c +++ b/arch/s390/crypto/aes_s390.c | |||
@@ -17,6 +17,9 @@ | |||
17 | * | 17 | * |
18 | */ | 18 | */ |
19 | 19 | ||
20 | #define KMSG_COMPONENT "aes_s390" | ||
21 | #define pr_fmt(fmt) KMSG_COMPONENT ": " fmt | ||
22 | |||
20 | #include <crypto/aes.h> | 23 | #include <crypto/aes.h> |
21 | #include <crypto/algapi.h> | 24 | #include <crypto/algapi.h> |
22 | #include <linux/err.h> | 25 | #include <linux/err.h> |
@@ -169,7 +172,8 @@ static int fallback_init_cip(struct crypto_tfm *tfm) | |||
169 | CRYPTO_ALG_ASYNC | CRYPTO_ALG_NEED_FALLBACK); | 172 | CRYPTO_ALG_ASYNC | CRYPTO_ALG_NEED_FALLBACK); |
170 | 173 | ||
171 | if (IS_ERR(sctx->fallback.cip)) { | 174 | if (IS_ERR(sctx->fallback.cip)) { |
172 | printk(KERN_ERR "Error allocating fallback algo %s\n", name); | 175 | pr_err("Allocating AES fallback algorithm %s failed\n", |
176 | name); | ||
173 | return PTR_ERR(sctx->fallback.blk); | 177 | return PTR_ERR(sctx->fallback.blk); |
174 | } | 178 | } |
175 | 179 | ||
@@ -349,7 +353,8 @@ static int fallback_init_blk(struct crypto_tfm *tfm) | |||
349 | CRYPTO_ALG_ASYNC | CRYPTO_ALG_NEED_FALLBACK); | 353 | CRYPTO_ALG_ASYNC | CRYPTO_ALG_NEED_FALLBACK); |
350 | 354 | ||
351 | if (IS_ERR(sctx->fallback.blk)) { | 355 | if (IS_ERR(sctx->fallback.blk)) { |
352 | printk(KERN_ERR "Error allocating fallback algo %s\n", name); | 356 | pr_err("Allocating AES fallback algorithm %s failed\n", |
357 | name); | ||
353 | return PTR_ERR(sctx->fallback.blk); | 358 | return PTR_ERR(sctx->fallback.blk); |
354 | } | 359 | } |
355 | 360 | ||
@@ -515,9 +520,8 @@ static int __init aes_s390_init(void) | |||
515 | 520 | ||
516 | /* z9 109 and z9 BC/EC only support 128 bit key length */ | 521 | /* z9 109 and z9 BC/EC only support 128 bit key length */ |
517 | if (keylen_flag == AES_KEYLEN_128) | 522 | if (keylen_flag == AES_KEYLEN_128) |
518 | printk(KERN_INFO | 523 | pr_info("AES hardware acceleration is only available for" |
519 | "aes_s390: hardware acceleration only available for " | 524 | " 128-bit keys\n"); |
520 | "128 bit keys\n"); | ||
521 | 525 | ||
522 | ret = crypto_register_alg(&aes_alg); | 526 | ret = crypto_register_alg(&aes_alg); |
523 | if (ret) | 527 | if (ret) |