From 74238e36f2baf3f4271a4a012986aa793b289003 Mon Sep 17 00:00:00 2001
From: Augustin Cavalier <waddlesplash@gmail.com>
Date: Thu, 15 Aug 2024 12:38:51 -0400
Subject: [PATCH] kernel/timer: Code cleanup.

 * Remove some unnecessary casts.
 * Clean up linked-list logic in add_event_to_list(). As previous->next
   will just be the same as "next", we can use that directly and thus
   remove some code duplication.

No functional change intended.
---
 src/system/kernel/timer.cpp | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/src/system/kernel/timer.cpp b/src/system/kernel/timer.cpp
index 8c68f87e83..affe2bf3d7 100644
--- a/src/system/kernel/timer.cpp
+++ b/src/system/kernel/timer.cpp
@@ -74,17 +74,15 @@ add_event_to_list(timer* event, timer** list)
 	timer* next;
 	timer* previous = NULL;
 
-	// stick it in the event list
-	for (next = *list; next != NULL; previous = next, next = (timer*)next->next) {
+	for (next = *list; next != NULL; previous = next, next = previous->next) {
 		if ((bigtime_t)next->schedule_time >= (bigtime_t)event->schedule_time)
 			break;
 	}
 
-	if (previous != NULL) {
-		event->next = previous->next;
+	event->next = next;
+	if (previous != NULL)
 		previous->next = event;
-	} else {
-		event->next = next;
+	else
 		*list = event;
 	}
 }
@@ -259,7 +257,7 @@ timer_interrupt()
 		// this event needs to happen
 		int mode = event->flags;
 
-		cpuData.events = (timer*)event->next;
+		cpuData.events = event->next;
 		cpuData.current_event = event;
 		atomic_set(&cpuData.current_event_in_progress, 1);