diff options
author | Mark Rustad <mark.d.rustad@intel.com> | 2014-07-25 05:53:38 -0400 |
---|---|---|
committer | Herbert Xu <herbert@gondor.apana.org.au> | 2014-08-01 10:35:55 -0400 |
commit | 3e3dc25fe7d5e33026bdfca5e8fab08be6a8729c (patch) | |
tree | c6ee3c7f38cfbca84b292c128a1a0d2e5fbb170b /crypto/cryptd.c | |
parent | 4839ddcaba266bcf37dfb00757f339ab9de4710e (diff) |
crypto: Resolve shadow warnings
Change formal parameters to not clash with global names to
eliminate many W=2 warnings.
Signed-off-by: Mark Rustad <mark.d.rustad@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Diffstat (limited to 'crypto/cryptd.c')
-rw-r--r-- | crypto/cryptd.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/crypto/cryptd.c b/crypto/cryptd.c index 7bdd61b867c8..e592c90abebb 100644 --- a/crypto/cryptd.c +++ b/crypto/cryptd.c | |||
@@ -233,7 +233,7 @@ static void cryptd_blkcipher_decrypt(struct crypto_async_request *req, int err) | |||
233 | } | 233 | } |
234 | 234 | ||
235 | static int cryptd_blkcipher_enqueue(struct ablkcipher_request *req, | 235 | static int cryptd_blkcipher_enqueue(struct ablkcipher_request *req, |
236 | crypto_completion_t complete) | 236 | crypto_completion_t compl) |
237 | { | 237 | { |
238 | struct cryptd_blkcipher_request_ctx *rctx = ablkcipher_request_ctx(req); | 238 | struct cryptd_blkcipher_request_ctx *rctx = ablkcipher_request_ctx(req); |
239 | struct crypto_ablkcipher *tfm = crypto_ablkcipher_reqtfm(req); | 239 | struct crypto_ablkcipher *tfm = crypto_ablkcipher_reqtfm(req); |
@@ -241,7 +241,7 @@ static int cryptd_blkcipher_enqueue(struct ablkcipher_request *req, | |||
241 | 241 | ||
242 | queue = cryptd_get_queue(crypto_ablkcipher_tfm(tfm)); | 242 | queue = cryptd_get_queue(crypto_ablkcipher_tfm(tfm)); |
243 | rctx->complete = req->base.complete; | 243 | rctx->complete = req->base.complete; |
244 | req->base.complete = complete; | 244 | req->base.complete = compl; |
245 | 245 | ||
246 | return cryptd_enqueue_request(queue, &req->base); | 246 | return cryptd_enqueue_request(queue, &req->base); |
247 | } | 247 | } |
@@ -414,7 +414,7 @@ static int cryptd_hash_setkey(struct crypto_ahash *parent, | |||
414 | } | 414 | } |
415 | 415 | ||
416 | static int cryptd_hash_enqueue(struct ahash_request *req, | 416 | static int cryptd_hash_enqueue(struct ahash_request *req, |
417 | crypto_completion_t complete) | 417 | crypto_completion_t compl) |
418 | { | 418 | { |
419 | struct cryptd_hash_request_ctx *rctx = ahash_request_ctx(req); | 419 | struct cryptd_hash_request_ctx *rctx = ahash_request_ctx(req); |
420 | struct crypto_ahash *tfm = crypto_ahash_reqtfm(req); | 420 | struct crypto_ahash *tfm = crypto_ahash_reqtfm(req); |
@@ -422,7 +422,7 @@ static int cryptd_hash_enqueue(struct ahash_request *req, | |||
422 | cryptd_get_queue(crypto_ahash_tfm(tfm)); | 422 | cryptd_get_queue(crypto_ahash_tfm(tfm)); |
423 | 423 | ||
424 | rctx->complete = req->base.complete; | 424 | rctx->complete = req->base.complete; |
425 | req->base.complete = complete; | 425 | req->base.complete = compl; |
426 | 426 | ||
427 | return cryptd_enqueue_request(queue, &req->base); | 427 | return cryptd_enqueue_request(queue, &req->base); |
428 | } | 428 | } |
@@ -667,14 +667,14 @@ static void cryptd_aead_decrypt(struct crypto_async_request *areq, int err) | |||
667 | } | 667 | } |
668 | 668 | ||
669 | static int cryptd_aead_enqueue(struct aead_request *req, | 669 | static int cryptd_aead_enqueue(struct aead_request *req, |
670 | crypto_completion_t complete) | 670 | crypto_completion_t compl) |
671 | { | 671 | { |
672 | struct cryptd_aead_request_ctx *rctx = aead_request_ctx(req); | 672 | struct cryptd_aead_request_ctx *rctx = aead_request_ctx(req); |
673 | struct crypto_aead *tfm = crypto_aead_reqtfm(req); | 673 | struct crypto_aead *tfm = crypto_aead_reqtfm(req); |
674 | struct cryptd_queue *queue = cryptd_get_queue(crypto_aead_tfm(tfm)); | 674 | struct cryptd_queue *queue = cryptd_get_queue(crypto_aead_tfm(tfm)); |
675 | 675 | ||
676 | rctx->complete = req->base.complete; | 676 | rctx->complete = req->base.complete; |
677 | req->base.complete = complete; | 677 | req->base.complete = compl; |
678 | return cryptd_enqueue_request(queue, &req->base); | 678 | return cryptd_enqueue_request(queue, &req->base); |
679 | } | 679 | } |
680 | 680 | ||