| Subject | [PATCH 31/45] C++: Avoid using 'compl' and 'and' as names | From | David Howells <> | Date | Sun, 01 Apr 2018 21:43:21 +0100 |
| |
'compl' and 'and' are synonyms for operators, so avoid them.
Signed-off-by: David Howells <dhowells@redhat.com> ---
include/linux/cpumask.h | 4 ++-- include/linux/crypto.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/include/linux/cpumask.h b/include/linux/cpumask.h index bf53d893ad02..73bee9ff6cb3 100644 --- a/include/linux/cpumask.h +++ b/include/linux/cpumask.h @@ -273,9 +273,9 @@ extern int cpumask_next_wrap(int n, const struct cpumask *mask, int start, bool * * After the loop, cpu is >= nr_cpu_ids. */ -#define for_each_cpu_and(cpu, mask, and) \ +#define for_each_cpu_and(cpu, mask, and_with) \ for ((cpu) = -1; \ - (cpu) = cpumask_next_and((cpu), (mask), (and)), \ + (cpu) = cpumask_next_and((cpu), (mask), (and_with)), \ (cpu) < nr_cpu_ids;) #endif /* SMP */ diff --git a/include/linux/crypto.h b/include/linux/crypto.h index 7e6e84cf6383..f8f95615ba69 100644 --- a/include/linux/crypto.h +++ b/include/linux/crypto.h @@ -1034,9 +1034,9 @@ static inline void ablkcipher_request_free(struct ablkcipher_request *req) */ static inline void ablkcipher_request_set_callback( struct ablkcipher_request *req, - u32 flags, crypto_completion_t compl, void *data) + u32 flags, crypto_completion_t c, void *data) { - req->base.complete = compl; + req->base.complete = c; req->base.data = data; req->base.flags = flags; }
|