| Message ID | 777ce8ba.12e.184705d4211.Coremail.wangkailong@jari.cn (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | a75df5be8e7b0ecfb413b7c02a2599be17d2721b |
| Headers | show |
| Series | kselftest/arm64: fix array_size.cocci warning | expand |
On Sun, 13 Nov 2022 17:41:10 +0800 (GMT+08:00), wangkailong@jari.cn wrote: > Fix following coccicheck warning: > > tools/testing/selftests/arm64/mte/check_mmap_options.c:64:24-25: > WARNING: Use ARRAY_SIZE > tools/testing/selftests/arm64/mte/check_mmap_options.c:66:20-21: > WARNING: Use ARRAY_SIZE > tools/testing/selftests/arm64/mte/check_mmap_options.c:135:25-26: > WARNING: Use ARRAY_SIZE > tools/testing/selftests/arm64/mte/check_mmap_options.c:96:25-26: > WARNING: Use ARRAY_SIZE > tools/testing/selftests/arm64/mte/check_mmap_options.c:190:24-25: > WARNING: Use ARRAY_SIZE > > [...] Applied to arm64 (for-next/selftests), thanks! [1/1] kselftest/arm64: fix array_size.cocci warning https://git.kernel.org/arm64/c/a75df5be8e7b Cheers,
diff --git a/tools/testing/selftests/arm64/mte/check_mmap_options.c b/tools/testing/selftests/arm64/mte/check_mmap_options.c index a04b12c21ac9..17694caaff53 100644 --- a/tools/testing/selftests/arm64/mte/check_mmap_options.c +++ b/tools/testing/selftests/arm64/mte/check_mmap_options.c @@ -61,9 +61,8 @@ static int check_anonymous_memory_mapping(int mem_type, int mode, int mapping, i { char *ptr, *map_ptr; int run, result, map_size; - int item = sizeof(sizes)/sizeof(int); + int item = ARRAY_SIZE(sizes); - item = sizeof(sizes)/sizeof(int); mte_switch_mode(mode, MTE_ALLOW_NON_ZERO_TAG); for (run = 0; run < item; run++) { map_size = sizes[run] + OVERFLOW + UNDERFLOW; @@ -93,7 +92,7 @@ static int check_file_memory_mapping(int mem_type, int mode, int mapping, int ta { char *ptr, *map_ptr; int run, fd, map_size; - int total = sizeof(sizes)/sizeof(int); + int total = ARRAY_SIZE(sizes); int result = KSFT_PASS; mte_switch_mode(mode, MTE_ALLOW_NON_ZERO_TAG); @@ -132,7 +131,7 @@ static int check_clear_prot_mte_flag(int mem_type, int mode, int mapping) { char *ptr, *map_ptr; int run, prot_flag, result, fd, map_size; - int total = sizeof(sizes)/sizeof(int); + int total = ARRAY_SIZE(sizes); prot_flag = PROT_READ | PROT_WRITE; mte_switch_mode(mode, MTE_ALLOW_NON_ZERO_TAG); @@ -187,7 +186,7 @@ static int check_clear_prot_mte_flag(int mem_type, int mode, int mapping) int main(int argc, char *argv[]) { int err; - int item = sizeof(sizes)/sizeof(int); + int item = ARRAY_SIZE(sizes); err = mte_default_setup(); if (err)
Fix following coccicheck warning: tools/testing/selftests/arm64/mte/check_mmap_options.c:64:24-25: WARNING: Use ARRAY_SIZE tools/testing/selftests/arm64/mte/check_mmap_options.c:66:20-21: WARNING: Use ARRAY_SIZE tools/testing/selftests/arm64/mte/check_mmap_options.c:135:25-26: WARNING: Use ARRAY_SIZE tools/testing/selftests/arm64/mte/check_mmap_options.c:96:25-26: WARNING: Use ARRAY_SIZE tools/testing/selftests/arm64/mte/check_mmap_options.c:190:24-25: WARNING: Use ARRAY_SIZE Signed-off-by: KaiLong Wang <wangkailong@jari.cn> --- tools/testing/selftests/arm64/mte/check_mmap_options.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-)