r600g: set the return type of radeon_destroy to void

This commit is contained in:
Marek Olšák
2011-09-11 18:01:25 +02:00
parent b87bc2eb44
commit ac028b20e5
2 changed files with 4 additions and 7 deletions
+1 -1
View File
@@ -303,7 +303,7 @@ void evergreen_context_pipe_state_set_ps_sampler(struct r600_context *ctx, struc
void evergreen_context_pipe_state_set_vs_sampler(struct r600_context *ctx, struct r600_pipe_state *state, unsigned id);
struct radeon *radeon_create(struct radeon_winsys *ws);
struct radeon *radeon_destroy(struct radeon *radeon);
void radeon_destroy(struct radeon *radeon);
void _r600_pipe_state_add_reg(struct r600_context *ctx,
struct r600_pipe_state *state,
+3 -6
View File
@@ -64,7 +64,8 @@ struct radeon *radeon_create(struct radeon_winsys *ws)
radeon->family = radeon_family_from_device(radeon->info.pci_id);
if (radeon->family == CHIP_UNKNOWN) {
fprintf(stderr, "Unknown chipset 0x%04X\n", radeon->info.pci_id);
return radeon_destroy(radeon);
radeon_destroy(radeon);
return NULL;
}
/* setup class */
@@ -81,11 +82,7 @@ struct radeon *radeon_create(struct radeon_winsys *ws)
return radeon;
}
struct radeon *radeon_destroy(struct radeon *radeon)
void radeon_destroy(struct radeon *radeon)
{
if (radeon == NULL)
return NULL;
FREE(radeon);
return NULL;
}