Don't cast the return value of malloc/realloc

This patch has been generated by the following Coccinelle semantic
patch:

// Don't cast the return value of malloc/realloc.
//
// Casting the return value of malloc/realloc only stands to hide
// errors.

@@
type T;
expression E1, E2;
@@
- (T)
(
_mesa_align_calloc(E1, E2)
|
_mesa_align_malloc(E1, E2)
|
calloc(E1, E2)
|
malloc(E1)
|
realloc(E1, E2)
)

4 files changed, 6 insertions, 6 deletions

diff --git a/src/gallium/drivers/r300/compiler/memory_pool.c b/src/gallium/drivers/r300/compiler/memory_pool.c
index ddcdddf9e3c..a98dd709f2a 100644
--- a/src/gallium/drivers/r300/compiler/memory_pool.c
+++ b/src/gallium/drivers/r300/compiler/memory_pool.c
@@ -58,7 +58,7 @@ static void refill_pool(struct memory_pool * pool)
 	if (!blocksize)
 		blocksize = 2*POOL_LARGE_ALLOC;
 
-	newblock = (struct memory_block*)malloc(blocksize);
+	newblock = malloc(blocksize);
 	newblock->next = pool->blocks;
 	pool->blocks = newblock;
 
@@ -85,7 +85,7 @@ void * memory_pool_malloc(struct memory_pool * pool, unsigned int bytes)
 
 		return ptr;
 	} else {
-		struct memory_block * block = (struct memory_block*)malloc(bytes + sizeof(struct memory_block));
+		struct memory_block * block = malloc(bytes + sizeof(struct memory_block));
 
 		block->next = pool->blocks;
 		pool->blocks = block;
diff --git a/src/gallium/drivers/r300/r300_cb.h b/src/gallium/drivers/r300/r300_cb.h
index b373937a1f9..e031e990bd7 100644
--- a/src/gallium/drivers/r300/r300_cb.h
+++ b/src/gallium/drivers/r300/r300_cb.h
@@ -82,7 +82,7 @@
     do { \
     assert(sizeof(*(ptr)) == sizeof(uint32_t)); \
     cs_count = (size); \
-    cs_ptr = (ptr) = (uint32_t*)malloc((size) * sizeof(uint32_t)); \
+    cs_ptr = (ptr) = malloc((size) * sizeof(uint32_t)); \
 } while (0)
 
 #define END_CB do { \
@@ -99,7 +99,7 @@
     uint32_t *cs_ptr = NULL; (void) cs_ptr
 
 #define NEW_CB(ptr, size) \
-    cs_ptr = (ptr) = (uint32_t*)malloc((size) * sizeof(uint32_t))
+    cs_ptr = (ptr) = malloc((size) * sizeof(uint32_t))
 
 #define BEGIN_CB(ptr, size) cs_ptr = (ptr)
 #define END_CB
diff --git a/src/gallium/drivers/r600/compute_memory_pool.c b/src/gallium/drivers/r600/compute_memory_pool.c
index ad9099fd2f4..d612a459843 100644
--- a/src/gallium/drivers/r600/compute_memory_pool.c
+++ b/src/gallium/drivers/r600/compute_memory_pool.c
@@ -210,7 +210,7 @@ void compute_memory_grow_pool(struct compute_memory_pool* pool,
 		COMPUTE_DBG("  Aligned size = %d\n", new_size_in_dw);
 
 		compute_memory_shadow(pool, pipe, 1);
-		pool->shadow = (uint32_t*)realloc(pool->shadow, new_size_in_dw*4);
+		pool->shadow = realloc(pool->shadow, new_size_in_dw*4);
 		pool->size_in_dw = new_size_in_dw;
 		pool->screen->screen.resource_destroy(
 			(struct pipe_screen *)pool->screen,
diff --git a/src/gallium/drivers/r600/r600_shader.c b/src/gallium/drivers/r600/r600_shader.c
index 834c0b32989..da8be0bbc17 100644
--- a/src/gallium/drivers/r600/r600_shader.c
+++ b/src/gallium/drivers/r600/r600_shader.c
@@ -4981,7 +4981,7 @@ static void fc_set_mid(struct r600_shader_ctx *ctx, int fc_sp)
 {
 	struct r600_cf_stack_entry *sp = &ctx->bc->fc_stack[fc_sp];
 
-	sp->mid = (struct r600_bytecode_cf **)realloc((void *)sp->mid,
+	sp->mid = realloc((void *)sp->mid,
 						sizeof(struct r600_bytecode_cf *) * (sp->num_mid + 1));
 	sp->mid[sp->num_mid] = ctx->bc->cf_last;
 	sp->num_mid++;