From f0aa8fd4e46f7fb00b493ce0267b4404b4a1a0dd Mon Sep 17 00:00:00 2001 From: Kenneth Graunke Date: Wed, 15 Mar 2017 00:40:44 -0700 Subject: [PATCH] aubinator: Delete redundant NULL check. handle_struct_decode() is just a wrapper around decode_structure() with a NULL check. But the only caller already does that NULL check. So, just use decode_structure() directly. Reviewed-by: Lionel Landwerlin --- src/intel/tools/aubinator.c | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/src/intel/tools/aubinator.c b/src/intel/tools/aubinator.c index 139637cfefa..676358f57a1 100644 --- a/src/intel/tools/aubinator.c +++ b/src/intel/tools/aubinator.c @@ -161,15 +161,6 @@ decode_structure(struct gen_spec *spec, struct gen_group *strct, } } -static void -handle_struct_decode(struct gen_spec *spec, char *struct_name, uint32_t *p) -{ - if (struct_name == NULL) - return; - struct gen_group *struct_val = gen_spec_find_struct(spec, struct_name); - decode_structure(spec, struct_val, p); -} - static void dump_binding_table(struct gen_spec *spec, uint32_t offset) { @@ -802,7 +793,9 @@ parse_commands(struct gen_spec *spec, uint32_t *cmds, int size, int engine) if (token != NULL) { printf("0x%08"PRIx64": 0x%08x : Dword %d\n", offset + 4 * idx, p[idx], idx); - handle_struct_decode(spec,token, &p[idx]); + struct gen_group *struct_val = + gen_spec_find_struct(spec, token); + decode_structure(spec, struct_val, &p[idx]); token = NULL; } } -- 2.30.2