From: Eric Engestrom <eric.engestrom@intel.com>
Date: Thu, 16 Aug 2018 14:37:22 +0000 (+0100)
Subject: intel/batch-decoder: replace local ARRAY_LENGTH() macro with global ARRAY_SIZE()
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=d6aea403267a96d9f840e308755e3c58315a70de;p=mesa.git

intel/batch-decoder: replace local ARRAY_LENGTH() macro with global ARRAY_SIZE()

Signed-off-by: Eric Engestrom <eric.engestrom@intel.com>
Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
---

diff --git a/src/intel/common/gen_batch_decoder.c b/src/intel/common/gen_batch_decoder.c
index f5be0018afc..f93f4df0066 100644
--- a/src/intel/common/gen_batch_decoder.c
+++ b/src/intel/common/gen_batch_decoder.c
@@ -23,6 +23,7 @@
 
 #include "common/gen_decoder.h"
 #include "gen_disasm.h"
+#include "util/macros.h"
 
 #include <string.h>
 
@@ -65,8 +66,6 @@ gen_batch_decode_ctx_finish(struct gen_batch_decode_ctx *ctx)
 #define GREEN_HEADER CSI "1;42m"
 #define NORMAL       CSI "0m"
 
-#define ARRAY_LENGTH(a) (sizeof (a) / sizeof (a)[0])
-
 static void
 ctx_print_group(struct gen_batch_decode_ctx *ctx,
                 struct gen_group *group,
@@ -835,7 +834,7 @@ gen_print_batch(struct gen_batch_decode_ctx *ctx,
       if (ctx->flags & GEN_BATCH_DECODE_FULL) {
          ctx_print_group(ctx, inst, offset, p);
 
-         for (int i = 0; i < ARRAY_LENGTH(custom_decoders); i++) {
+         for (int i = 0; i < ARRAY_SIZE(custom_decoders); i++) {
             if (strcmp(inst_name, custom_decoders[i].cmd_name) == 0) {
                custom_decoders[i].decode(ctx, p);
                break;