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 /include/crypto | |
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 'include/crypto')
-rw-r--r-- | include/crypto/aead.h | 4 | ||||
-rw-r--r-- | include/crypto/hash.h | 4 | ||||
-rw-r--r-- | include/crypto/skcipher.h | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/include/crypto/aead.h b/include/crypto/aead.h index 0edf949f6369..94b19be67574 100644 --- a/include/crypto/aead.h +++ b/include/crypto/aead.h | |||
@@ -75,9 +75,9 @@ static inline void aead_givcrypt_free(struct aead_givcrypt_request *req) | |||
75 | 75 | ||
76 | static inline void aead_givcrypt_set_callback( | 76 | static inline void aead_givcrypt_set_callback( |
77 | struct aead_givcrypt_request *req, u32 flags, | 77 | struct aead_givcrypt_request *req, u32 flags, |
78 | crypto_completion_t complete, void *data) | 78 | crypto_completion_t compl, void *data) |
79 | { | 79 | { |
80 | aead_request_set_callback(&req->areq, flags, complete, data); | 80 | aead_request_set_callback(&req->areq, flags, compl, data); |
81 | } | 81 | } |
82 | 82 | ||
83 | static inline void aead_givcrypt_set_crypt(struct aead_givcrypt_request *req, | 83 | static inline void aead_givcrypt_set_crypt(struct aead_givcrypt_request *req, |
diff --git a/include/crypto/hash.h b/include/crypto/hash.h index 26cb1eb16f4c..a39195539601 100644 --- a/include/crypto/hash.h +++ b/include/crypto/hash.h | |||
@@ -238,10 +238,10 @@ static inline struct ahash_request *ahash_request_cast( | |||
238 | 238 | ||
239 | static inline void ahash_request_set_callback(struct ahash_request *req, | 239 | static inline void ahash_request_set_callback(struct ahash_request *req, |
240 | u32 flags, | 240 | u32 flags, |
241 | crypto_completion_t complete, | 241 | crypto_completion_t compl, |
242 | void *data) | 242 | void *data) |
243 | { | 243 | { |
244 | req->base.complete = complete; | 244 | req->base.complete = compl; |
245 | req->base.data = data; | 245 | req->base.data = data; |
246 | req->base.flags = flags; | 246 | req->base.flags = flags; |
247 | } | 247 | } |
diff --git a/include/crypto/skcipher.h b/include/crypto/skcipher.h index 25fd6126522d..07d245f073d1 100644 --- a/include/crypto/skcipher.h +++ b/include/crypto/skcipher.h | |||
@@ -86,9 +86,9 @@ static inline void skcipher_givcrypt_free(struct skcipher_givcrypt_request *req) | |||
86 | 86 | ||
87 | static inline void skcipher_givcrypt_set_callback( | 87 | static inline void skcipher_givcrypt_set_callback( |
88 | struct skcipher_givcrypt_request *req, u32 flags, | 88 | struct skcipher_givcrypt_request *req, u32 flags, |
89 | crypto_completion_t complete, void *data) | 89 | crypto_completion_t compl, void *data) |
90 | { | 90 | { |
91 | ablkcipher_request_set_callback(&req->creq, flags, complete, data); | 91 | ablkcipher_request_set_callback(&req->creq, flags, compl, data); |
92 | } | 92 | } |
93 | 93 | ||
94 | static inline void skcipher_givcrypt_set_crypt( | 94 | static inline void skcipher_givcrypt_set_crypt( |