summaryrefslogtreecommitdiff
path: root/src/intel
diff options
context:
space:
mode:
authorEric Anholt <eric@anholt.net>2017-07-12 13:11:34 -0700
committerEric Anholt <eric@anholt.net>2017-07-25 14:44:52 -0700
commit19ffa4bfb281fb8814f666bac1d0c96a42e6edbb (patch)
treec3f1c1fce081c742815223676cc6f8728d41c63b /src/intel
parent91735e2d4a25df0685e5f4c8f0a064f9d58c6b8e (diff)
intel/decoder: Reuse the MAX2 macro instead of defining another one.
Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Diffstat (limited to 'src/intel')
-rw-r--r--src/intel/common/gen_decoder.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/intel/common/gen_decoder.c b/src/intel/common/gen_decoder.c
index ba3a5139ae..60591ad666 100644
--- a/src/intel/common/gen_decoder.c
+++ b/src/intel/common/gen_decoder.c
@@ -39,8 +39,6 @@
#define XML_BUFFER_SIZE 4096
-#define MAX(a, b) ((a) < (b) ? (b) : (a))
-
#define MAKE_GEN(major, minor) ( ((major) << 8) | (minor) )
struct gen_spec {
@@ -381,7 +379,7 @@ create_and_append_field(struct parser_context *ctx,
const char **atts)
{
if (ctx->group->nfields == ctx->group->fields_size) {
- ctx->group->fields_size = MAX(ctx->group->fields_size * 2, 2);
+ ctx->group->fields_size = MAX2(ctx->group->fields_size * 2, 2);
ctx->group->fields =
(struct gen_field **) realloc(ctx->group->fields,
sizeof(ctx->group->fields[0]) *