3 files changed, 1 insertions, 34 deletions
diff --git a/lib/utils/timer/fdt_timer.c b/lib/utils/timer/fdt_timer.c
index aa0494e4..37965f5e 100644
--- a/lib/utils/timer/fdt_timer.c
+++ b/lib/utils/timer/fdt_timer.c
@@ -16,22 +16,7 @@
 extern struct fdt_timer *fdt_timer_drivers[];
 extern unsigned long fdt_timer_drivers_size;
 
-static struct fdt_timer *current_driver = NULL;
-
-void fdt_timer_exit(void)
-{
-	if (current_driver && current_driver->exit)
-		current_driver->exit();
-}
-
-static int fdt_timer_warm_init(void)
-{
-	if (current_driver && current_driver->warm_init)
-		return current_driver->warm_init();
-	return 0;
-}
-
-static int fdt_timer_cold_init(void)
+int fdt_timer_init(void)
 {
 	int pos, noff, rc;
 	struct fdt_timer *drv;
@@ -56,7 +41,6 @@ static int fdt_timer_cold_init(void)
 				continue;
 			if (rc)
 				return rc;
-			current_driver = drv;
 
 			/*
 			 * We will have multiple timer devices on multi-die or
@@ -71,16 +55,3 @@ static int fdt_timer_cold_init(void)
 	 */
 	return 0;
 }
-
-int fdt_timer_init(bool cold_boot)
-{
-	int rc;
-
-	if (cold_boot) {
-		rc = fdt_timer_cold_init();
-		if (rc)
-			return rc;
-	}
-
-	return fdt_timer_warm_init();
-}
diff --git a/lib/utils/timer/fdt_timer_mtimer.c b/lib/utils/timer/fdt_timer_mtimer.c
index eff50417..e752ddc5 100644
--- a/lib/utils/timer/fdt_timer_mtimer.c
+++ b/lib/utils/timer/fdt_timer_mtimer.c
@@ -165,6 +165,4 @@ static const struct fdt_match timer_mtimer_match[] = {
 struct fdt_timer fdt_timer_mtimer = {
 	.match_table = timer_mtimer_match,
 	.cold_init = timer_mtimer_cold_init,
-	.warm_init = NULL,
-	.exit = NULL,
 };
diff --git a/lib/utils/timer/fdt_timer_plmt.c b/lib/utils/timer/fdt_timer_plmt.c
index 87e634bd..459a1190 100644
--- a/lib/utils/timer/fdt_timer_plmt.c
+++ b/lib/utils/timer/fdt_timer_plmt.c
@@ -46,6 +46,4 @@ static const struct fdt_match timer_plmt_match[] = {
 struct fdt_timer fdt_timer_plmt = {
 	.match_table = timer_plmt_match,
 	.cold_init   = fdt_plmt_cold_timer_init,
-	.warm_init   = NULL,
-	.exit	     = NULL,
 };