Fix all ISO C90 warnings

Signed-off-by: Oded Gabbay <oded.gabbay@gmail.com>

7 files changed, 68 insertions, 42 deletions

diff --git a/hsakmt/debug.c b/hsakmt/debug.c
index 2fd1c04..347a6c2 100644
--- a/hsakmt/debug.c
+++ b/hsakmt/debug.c
@@ -36,16 +36,17 @@ hsaKmtDbgRegister(
 {
 	HSAKMT_STATUS result;
 	uint32_t gpu_id;
+	struct kfd_ioctl_dbg_register_args args;
+	long err;
 	CHECK_KFD_OPEN();
 
 	result = validate_nodeid(NodeId, &gpu_id);
 	if (result != HSAKMT_STATUS_SUCCESS)
 		return result;
 
-	struct kfd_ioctl_dbg_register_args args;
 	memset(&args, 0, sizeof(args));
 	args.gpu_id = gpu_id;
-	long  err = kmtIoctl(kfd_fd, AMDKFD_IOC_DBG_REGISTER, &args);
+	err = kmtIoctl(kfd_fd, AMDKFD_IOC_DBG_REGISTER, &args);
 
 	if (err == 0)
 		result = HSAKMT_STATUS_SUCCESS;
@@ -63,16 +64,17 @@ hsaKmtDbgUnregister(
 {
 	HSAKMT_STATUS result;
 	uint32_t gpu_id;
+	struct kfd_ioctl_dbg_unregister_args args;
+	long err;
 	CHECK_KFD_OPEN();
 
 	result = validate_nodeid(NodeId, &gpu_id);
 	if (result != HSAKMT_STATUS_SUCCESS)
 		return result;
 
-	struct kfd_ioctl_dbg_unregister_args args;
 	memset(&args, 0, sizeof(args));
 	args.gpu_id = gpu_id;
-	long  err = kmtIoctl(kfd_fd, AMDKFD_IOC_DBG_UNREGISTER, &args);
+	err = kmtIoctl(kfd_fd, AMDKFD_IOC_DBG_UNREGISTER, &args);
 	if (err == 0)
 		result = HSAKMT_STATUS_SUCCESS;
 	else
@@ -93,7 +95,9 @@ hsaKmtDbgWavefrontControl(
 {
 	HSAKMT_STATUS result;
 	uint32_t gpu_id;
-
+	uint32_t buff_size;
+	unsigned char *run_ptr;
+	long err;
 	struct kfd_ioctl_dbg_wave_control_args *args;
 
 	CHECK_KFD_OPEN();
@@ -103,11 +107,11 @@ hsaKmtDbgWavefrontControl(
 		return result;
 
 	/* Determine Size  of the ioctl buffer */
-	uint32_t buff_size = sizeof(Operand) +
-				sizeof(Mode) + sizeof(TrapId) +
-				sizeof(DbgWaveMsgRing->DbgWaveMsg) +
-				sizeof(DbgWaveMsgRing->MemoryVA) +
-				sizeof(*args);
+	buff_size = sizeof(Operand) +
+		    sizeof(Mode) + sizeof(TrapId) +
+		    sizeof(DbgWaveMsgRing->DbgWaveMsg) +
+		    sizeof(DbgWaveMsgRing->MemoryVA) +
+		    sizeof(*args);
 
 	args = (struct kfd_ioctl_dbg_wave_control_args*) malloc(buff_size);
 	if (args == NULL)
@@ -119,7 +123,7 @@ hsaKmtDbgWavefrontControl(
 	args->buf_size_in_bytes = buff_size;
 
 	/* increment pointer to the start of the non fixed part */
-	unsigned char* run_ptr = (unsigned char*)args + sizeof(*args);
+	run_ptr = (unsigned char*)args + sizeof(*args);
 
 	/* save variable content pointer for kfd */
 	args->content_ptr = (uint64_t) run_ptr;
@@ -141,7 +145,7 @@ hsaKmtDbgWavefrontControl(
 	run_ptr += sizeof(DbgWaveMsgRing->MemoryVA);
 
 	/* send to kernel */
-	long err = kmtIoctl(kfd_fd, AMDKFD_IOC_DBG_WAVE_CONTROL, args);
+	err = kmtIoctl(kfd_fd, AMDKFD_IOC_DBG_WAVE_CONTROL, args);
 
 	free (args);
 
@@ -168,6 +172,8 @@ hsaKmtDbgAddressWatch(
 	uint32_t buff_size;
 	uint32_t watch_mask_items, watch_event_items;
 	HSAuint32 i;
+	unsigned char *run_ptr;
+	long err;
 
 	/*
 	 * Determine the size of the watch mask and event buffers
@@ -208,7 +214,7 @@ hsaKmtDbgAddressWatch(
 	args->buf_size_in_bytes = buff_size;
 
 	/* increment pointer to the start of the non fixed part */
-	unsigned char* run_ptr = (unsigned char*)args + sizeof(*args);
+	run_ptr = (unsigned char*)args + sizeof(*args);
 
 	/* save variable content pointer for kfd */
 	args->content_ptr = (uint64_t) run_ptr;
@@ -238,7 +244,7 @@ hsaKmtDbgAddressWatch(
 	}
 
 	/* send to kernel */
-	long err = kmtIoctl(kfd_fd, AMDKFD_IOC_DBG_ADDRESS_WATCH, args);
+	err = kmtIoctl(kfd_fd, AMDKFD_IOC_DBG_ADDRESS_WATCH, args);
 
 	free (args);
 
diff --git a/hsakmt/events.c b/hsakmt/events.c
index 53bf3c4..97a007b 100644
--- a/hsakmt/events.c
+++ b/hsakmt/events.c
@@ -49,6 +49,9 @@ hsaKmtCreateEvent(
     HsaEvent**          Event                   //OUT
     )
 {
+	HsaEvent *e;
+	struct kfd_ioctl_create_event_args args;
+
 	CHECK_KFD_OPEN();
 
 	if (EventDesc->EventType >= HSA_EVENTTYPE_MAXID)
@@ -56,7 +59,7 @@ hsaKmtCreateEvent(
 		return HSAKMT_STATUS_INVALID_PARAMETER;
 	}
 
-	HsaEvent* e = malloc(sizeof(HsaEvent));
+	e = malloc(sizeof(HsaEvent));
 	if (e == NULL)
 	{
 		return HSAKMT_STATUS_ERROR;
@@ -64,7 +67,6 @@ hsaKmtCreateEvent(
 
 	memset(e, 0, sizeof(*e));
 
-	struct kfd_ioctl_create_event_args args;
 	memset(&args, 0, sizeof(args));
 
 	args.event_type = EventDesc->EventType;
@@ -113,12 +115,13 @@ hsaKmtDestroyEvent(
     HsaEvent*   Event    //IN
     )
 {
+	struct kfd_ioctl_destroy_event_args args;
+
 	CHECK_KFD_OPEN();
 
 	if (!Event)
 		return HSAKMT_STATUS_INVALID_HANDLE;
 
-	struct kfd_ioctl_destroy_event_args args;
 	memset(&args, 0, sizeof(args));
 
 	args.event_id = Event->EventId;
@@ -138,6 +141,8 @@ hsaKmtSetEvent(
     HsaEvent*  Event    //IN
     )
 {
+	struct kfd_ioctl_set_event_args args;
+
 	CHECK_KFD_OPEN();
 
 	if (!Event)
@@ -147,7 +152,6 @@ hsaKmtSetEvent(
 	if (IsSystemEventType(Event->EventData.EventType))
 		return HSAKMT_STATUS_ERROR;
 
-	struct kfd_ioctl_set_event_args args;
 	memset(&args, 0, sizeof(args));
 
 	args.event_id = Event->EventId;
@@ -164,6 +168,8 @@ hsaKmtResetEvent(
     HsaEvent*  Event    //IN
     )
 {
+	struct kfd_ioctl_reset_event_args args;
+
 	CHECK_KFD_OPEN();
 
 	if (!Event)
@@ -173,7 +179,6 @@ hsaKmtResetEvent(
 	if (IsSystemEventType(Event->EventData.EventType))
 		return HSAKMT_STATUS_ERROR;
 
-	struct kfd_ioctl_reset_event_args args;
 	memset(&args, 0, sizeof(args));
 
 	args.event_id = Event->EventId;
@@ -220,18 +225,21 @@ hsaKmtWaitOnMultipleEvents(
     HSAuint32   Milliseconds    //IN
     )
 {
+	HSAKMT_STATUS result;
+	struct kfd_event_data *event_data;
+	struct kfd_ioctl_wait_events_args args;
+
 	CHECK_KFD_OPEN();
 
 	if (!Events)
 		return HSAKMT_STATUS_INVALID_HANDLE;
 
-	struct kfd_event_data *event_data = malloc(NumEvents * sizeof(struct kfd_event_data));
+	event_data = malloc(NumEvents * sizeof(struct kfd_event_data));
 	for (HSAuint32 i = 0; i < NumEvents; i++) {
 		event_data[i].event_id = Events[i]->EventId;
 		event_data[i].kfd_event_data_ext = (uint64_t)(uintptr_t)NULL;
 	}
 
-	struct kfd_ioctl_wait_events_args args;
 	memset(&args, 0, sizeof(args));
 
 	args.wait_for_all = WaitOnAll;
@@ -239,8 +247,6 @@ hsaKmtWaitOnMultipleEvents(
 	args.num_events = NumEvents;
 	args.events_ptr = (uint64_t)(uintptr_t)event_data;
 
-	HSAKMT_STATUS result;
-
 	if (kmtIoctl(kfd_fd, AMDKFD_IOC_WAIT_EVENTS, &args) == -1) {
 		result = HSAKMT_STATUS_ERROR;
 	}
diff --git a/hsakmt/fmm.c b/hsakmt/fmm.c
index 4a76417..9fff8d4 100644
--- a/hsakmt/fmm.c
+++ b/hsakmt/fmm.c
@@ -213,12 +213,14 @@ static bool aperture_is_valid(void* app_base, void* app_limit){
 /*
  * Assumes that fmm_mutex is locked on entry.
  */
-static int aperture_release(manageble_aperture_t* app, void* address, uint64_t MemorySizeInBytes){
-	int rc = -1;
+static int aperture_release(manageble_aperture_t* app, void* address, uint64_t MemorySizeInBytes)
+{
+	vm_object_t* object;
 	vm_area_t* area;
+	int rc = -1;
 
 	area = vm_find(app, address);
-	vm_object_t* object = vm_find_object_by_address(app, address, MemorySizeInBytes);
+	object = vm_find_object_by_address(app, address, MemorySizeInBytes);
 	if (object && area){
 		vm_remove_object(app, object);
 		if (VOID_PTRS_SUB(area->end, area->start) + 1 > MemorySizeInBytes){ // the size of the released block is less than the size of area
diff --git a/hsakmt/memory.c b/hsakmt/memory.c
index 39f852e..dc46e7e 100644
--- a/hsakmt/memory.c
+++ b/hsakmt/memory.c
@@ -46,6 +46,8 @@ hsaKmtSetMemoryPolicy(
 {
 	HSAKMT_STATUS result;
 	uint32_t gpu_id;
+	struct kfd_ioctl_set_memory_policy_args args;
+	int err;
 
 	CHECK_KFD_OPEN();
 
@@ -63,7 +65,6 @@ hsaKmtSetMemoryPolicy(
 	CHECK_PAGE_MULTIPLE(MemoryAddressAlternate);
 	CHECK_PAGE_MULTIPLE(MemorySizeInBytes);
 
-	struct kfd_ioctl_set_memory_policy_args args;
 	memset(&args, 0, sizeof(args));
 
 	args.gpu_id = gpu_id;
@@ -72,7 +73,7 @@ hsaKmtSetMemoryPolicy(
 	args.alternate_aperture_base = (uintptr_t)MemoryAddressAlternate;
 	args.alternate_aperture_size = MemorySizeInBytes;
 
-	int err = kmtIoctl(kfd_fd, AMDKFD_IOC_SET_MEMORY_POLICY, &args);
+	err = kmtIoctl(kfd_fd, AMDKFD_IOC_SET_MEMORY_POLICY, &args);
 
 	return (err == -1) ? HSAKMT_STATUS_ERROR : HSAKMT_STATUS_SUCCESS;
 }
@@ -98,17 +99,19 @@ hsaKmtAllocMemory(
     void**          MemoryAddress           //OUT (page-aligned)
     )
 {
-	CHECK_KFD_OPEN();
 	HSAKMT_STATUS result;
 	uint32_t gpu_id;
 	int err;
+	HSAuint64 page_size;
+
+	CHECK_KFD_OPEN();
 
 	result = validate_nodeid(PreferredNode, &gpu_id);
 	if (result != HSAKMT_STATUS_SUCCESS)
 		return result;
 
 	// The required size should be page aligned (GDS?)
-	HSAuint64 page_size = PageSizeFromFlags(MemFlags.ui32.PageSize);
+	page_size = PageSizeFromFlags(MemFlags.ui32.PageSize);
 	if ((SizeInBytes & (page_size-1)) && !MemFlags.ui32.GDSMemory){
 		return HSAKMT_STATUS_INVALID_PARAMETER;
 	}
diff --git a/hsakmt/queues.c b/hsakmt/queues.c
index 1027e30..368f1c0 100644
--- a/hsakmt/queues.c
+++ b/hsakmt/queues.c
@@ -195,18 +195,20 @@ hsaKmtCreateQueue(
 	struct device_info *dev_info;
 	int err;
 	void* ptr;
+	struct queue *q;
+	struct kfd_ioctl_create_queue_args args;
+
 	CHECK_KFD_OPEN();
 
 	result = validate_nodeid(NodeId, &gpu_id);
 	if (result != HSAKMT_STATUS_SUCCESS)
 		return result;
 
-	struct queue *q = malloc(sizeof(struct queue));
+	q = malloc(sizeof(struct queue));
 	if (q == NULL)
 		return HSAKMT_STATUS_NO_MEMORY;
 	memset(q, 0, sizeof(*q));
 
-	struct kfd_ioctl_create_queue_args args;
 	memset(&args, 0, sizeof(args));
 
 	dev_id = get_device_id_by_node(NodeId);
@@ -289,6 +291,7 @@ hsaKmtUpdateQueue(
 {
 	struct kfd_ioctl_update_queue_args arg;
 	struct queue *q = PORT_UINT64_TO_VPTR(QueueId);
+	int err;
 
 	CHECK_KFD_OPEN();
 
@@ -300,7 +303,7 @@ hsaKmtUpdateQueue(
 	arg.queue_percentage = QueuePercentage;
 	arg.queue_priority = Priority;
 
-	int err = kmtIoctl(kfd_fd, AMDKFD_IOC_UPDATE_QUEUE, &arg);
+	err = kmtIoctl(kfd_fd, AMDKFD_IOC_UPDATE_QUEUE, &arg);
 	if (err == -1)
 	{
 		return HSAKMT_STATUS_ERROR;
@@ -315,10 +318,13 @@ hsaKmtDestroyQueue(
     HSA_QUEUEID         QueueId         //IN
     )
 {
+	int err;
+	struct queue *q;
+	struct kfd_ioctl_destroy_queue_args args;
+
 	CHECK_KFD_OPEN();
 
-	struct queue *q = PORT_UINT64_TO_VPTR(QueueId);
-	struct kfd_ioctl_destroy_queue_args args;
+	q = PORT_UINT64_TO_VPTR(QueueId);
 
 	if (q == NULL)
 			return (HSAKMT_STATUS_INVALID_PARAMETER);
@@ -327,7 +333,7 @@ hsaKmtDestroyQueue(
 
 	args.queue_id = q->queue_id;
 
-	int err = kmtIoctl(kfd_fd, AMDKFD_IOC_DESTROY_QUEUE, &args);
+	err = kmtIoctl(kfd_fd, AMDKFD_IOC_DESTROY_QUEUE, &args);
 
 	if (err == -1)
 	{
diff --git a/hsakmt/topology.c b/hsakmt/topology.c
index 903b6f7..221bbeb 100644
--- a/hsakmt/topology.c
+++ b/hsakmt/topology.c
@@ -743,10 +743,10 @@ HSAKMT_STATUS
 HSAKMTAPI
 hsaKmtReleaseSystemProperties(void)
 {
-	CHECK_KFD_OPEN();
-
 	HSAKMT_STATUS err;
 
+	CHECK_KFD_OPEN();
+
 	pthread_mutex_lock(&hsakmt_mutex);
 
 	err = topology_drop_snapshot();
@@ -955,17 +955,19 @@ uint16_t get_device_id_by_node(HSAuint32 node_id)
 static int get_cpu_stepping(uint16_t* stepping)
 {
 	int ret;
+	char *p, *read_buf;
+	int read_size;
 	FILE* fd = fopen("/proc/cpuinfo", "r");
 	if (!fd)
 		return -1;
 
-	char* read_buf = malloc(PAGE_SIZE);
+	read_buf = malloc(PAGE_SIZE);
 	if (!read_buf) {
 		ret = -1;
 		goto err1;
 	}
 
-	int read_size = fread(read_buf, 1, PAGE_SIZE, fd);
+	read_size = fread(read_buf, 1, PAGE_SIZE, fd);
 	if (read_size <= 0) {
 		ret = -2;
 		goto err2;
@@ -978,7 +980,7 @@ static int get_cpu_stepping(uint16_t* stepping)
 
 	*stepping = 0;
 
-	char* p = strstr(read_buf, "stepping");
+	p = strstr(read_buf, "stepping");
 	if (p)
 		sscanf(p , "stepping\t: %hu\n", stepping);
 
diff --git a/hsakmt/version.c b/hsakmt/version.c
index 44b390c..c3392e8 100644
--- a/hsakmt/version.c
+++ b/hsakmt/version.c
@@ -34,9 +34,10 @@ hsaKmtGetVersion(
     HsaVersionInfo*  VersionInfo    //OUT
     )
 {
+	struct kfd_ioctl_get_version_args args;
+
 	CHECK_KFD_OPEN();
 
-	struct kfd_ioctl_get_version_args args;
 	memset(&args, 0, sizeof(args));
 
 	if (kmtIoctl(kfd_fd, AMDKFD_IOC_GET_VERSION, &args) == -1)