[PATCH] crypto: jitter - replace ARRAY_SIZE definition with header include

Ruben Wauters posted 1 patch 2 months, 3 weeks ago
crypto/jitterentropy.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
[PATCH] crypto: jitter - replace ARRAY_SIZE definition with header include
Posted by Ruben Wauters 2 months, 3 weeks ago
The ARRAY_SIZE macro is already defined in linux/array_size.h

This patch replaces the ARRAY_SIZE definition in jitterentropy.c with
an include, to make the code cleaner, and help reduce the number of
duplicate ARRAY_SIZE definitions in the codebase.

Signed-off-by: Ruben Wauters <rubenru09@aol.com>
---
 crypto/jitterentropy.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crypto/jitterentropy.c b/crypto/jitterentropy.c
index 3b390bd6c119..2920ecbf3f13 100644
--- a/crypto/jitterentropy.c
+++ b/crypto/jitterentropy.c
@@ -147,6 +147,7 @@ struct rand_data {
 
 #include <linux/fips.h>
 #include <linux/minmax.h>
+#include <linux/array_size.h>
 #include "jitterentropy.h"
 
 /***************************************************************************
@@ -178,7 +179,6 @@ static const unsigned int jent_apt_cutoff_lookup[15] = {
 static const unsigned int jent_apt_cutoff_permanent_lookup[15] = {
 	355, 447, 479, 494, 502, 507, 510, 512,
 	512, 512, 512, 512, 512, 512, 512 };
-#define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0]))
 
 static void jent_apt_init(struct rand_data *ec, unsigned int osr)
 {
-- 
2.49.1
Re: [PATCH] crypto: jitter - replace ARRAY_SIZE definition with header include
Posted by Herbert Xu 2 months, 2 weeks ago
Ruben Wauters <rubenru09@aol.com> wrote:
> The ARRAY_SIZE macro is already defined in linux/array_size.h
> 
> This patch replaces the ARRAY_SIZE definition in jitterentropy.c with
> an include, to make the code cleaner, and help reduce the number of
> duplicate ARRAY_SIZE definitions in the codebase.
> 
> Signed-off-by: Ruben Wauters <rubenru09@aol.com>
> ---
> crypto/jitterentropy.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)

Patch applied.  Thanks.
-- 
Email: Herbert Xu <herbert@gondor.apana.org.au>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt