From: Andrii Simiklit Date: Tue, 13 Nov 2018 12:19:28 +0000 (+0200) Subject: intel/tools: avoid 'unused variable' warnings X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=69ee49ac4678a60e2ae762b9f7752e61d27347c6;p=mesa.git intel/tools: avoid 'unused variable' warnings 1. tools/aub_read.c:271:31: warning: unused variable ‘end’ const uint32_t *p = data, *end = data + data_len, *next; 2. tools/aub_mem.c:292:13: warning: unused variable ‘res’ void *res = mmap((uint8_t *)bo.map + map_offset, 4096, PROT_READ, tools/aub_mem.c:357:13: warning: unused variable ‘res’ void *res = mmap((uint8_t *)bo.map + (page - bo.addr), 4096, PROT_READ, v2: The i965_disasm.c changes was moved into a separate patch The 'end' variable declared separately with MAYBE_UNUSED to avoid effect of it to other variables. ( Eric Engestrom ) Signed-off-by: Andrii Simiklit Reviewed-by: Eric Engestrom --- diff --git a/src/intel/tools/aub_mem.c b/src/intel/tools/aub_mem.c index 58b51b78a55..98e14219c59 100644 --- a/src/intel/tools/aub_mem.c +++ b/src/intel/tools/aub_mem.c @@ -289,8 +289,9 @@ aub_mem_get_ggtt_bo(void *_mem, uint64_t address) continue; uint32_t map_offset = i->virt_addr - address; - void *res = mmap((uint8_t *)bo.map + map_offset, 4096, PROT_READ, - MAP_SHARED | MAP_FIXED, mem->mem_fd, phys_mem->fd_offset); + MAYBE_UNUSED void *res = + mmap((uint8_t *)bo.map + map_offset, 4096, PROT_READ, + MAP_SHARED | MAP_FIXED, mem->mem_fd, phys_mem->fd_offset); assert(res != MAP_FAILED); } @@ -354,8 +355,9 @@ aub_mem_get_ppgtt_bo(void *_mem, uint64_t address) for (uint64_t page = address; page < end; page += 4096) { struct phys_mem *phys_mem = ppgtt_walk(mem, mem->pml4, page); - void *res = mmap((uint8_t *)bo.map + (page - bo.addr), 4096, PROT_READ, - MAP_SHARED | MAP_FIXED, mem->mem_fd, phys_mem->fd_offset); + MAYBE_UNUSED void *res = + mmap((uint8_t *)bo.map + (page - bo.addr), 4096, PROT_READ, + MAP_SHARED | MAP_FIXED, mem->mem_fd, phys_mem->fd_offset); assert(res != MAP_FAILED); } diff --git a/src/intel/tools/aub_read.c b/src/intel/tools/aub_read.c index 20cb515376f..513da3bf847 100644 --- a/src/intel/tools/aub_read.c +++ b/src/intel/tools/aub_read.c @@ -288,7 +288,8 @@ handle_memtrace_mem_write(struct aub_read *read, const uint32_t *p) int aub_read_command(struct aub_read *read, const void *data, uint32_t data_len) { - const uint32_t *p = data, *end = data + data_len, *next; + const uint32_t *p = data, *next; + MAYBE_UNUSED const uint32_t *end = data + data_len; uint32_t h, header_length, bias; assert(data_len >= 4);