From fae10a7ca1ab1977b28e1ead5342953908dfd0a3 Mon Sep 17 00:00:00 2001
From: Michael Brown
Date: Tue, 3 Jul 2007 20:34:51 +0100
Subject: We don't actually use the reset functions anywhere, and nothing
 really provides them.

---
 src/arch/i386/core/cpu.c        | 2 +-
 src/arch/i386/core/gdbsym.c     | 2 +-
 src/arch/i386/core/i386_timer.c | 2 +-
 src/arch/i386/core/video_subr.c | 2 +-
 src/core/btext.c                | 2 +-
 src/core/init.c                 | 9 ---------
 src/core/pcmcia.c               | 2 +-
 src/core/serial.c               | 2 +-
 src/include/gpxe/init.h         | 5 +----
 src/proto/nfs.c                 | 2 +-
 10 files changed, 9 insertions(+), 21 deletions(-)

diff --git a/src/arch/i386/core/cpu.c b/src/arch/i386/core/cpu.c
index 2d2e1888..b43ee425 100644
--- a/src/arch/i386/core/cpu.c
+++ b/src/arch/i386/core/cpu.c
@@ -85,6 +85,6 @@ void cpu_setup(void)
 	identify_cpu(&cpu_info);
 }
 
-INIT_FN ( INIT_CPU, cpu_setup, NULL, NULL );
+INIT_FN ( INIT_CPU, cpu_setup, NULL );
 
 #endif /* CONFIG_X86_64 */
diff --git a/src/arch/i386/core/gdbsym.c b/src/arch/i386/core/gdbsym.c
index ebe5893b..1e0cadec 100644
--- a/src/arch/i386/core/gdbsym.c
+++ b/src/arch/i386/core/gdbsym.c
@@ -28,4 +28,4 @@ static void gdb_symbol_line ( void ) {
 	getkey();
 }
 
-INIT_FN ( INIT_GDBSYM, gdb_symbol_line, NULL, NULL );
+INIT_FN ( INIT_GDBSYM, gdb_symbol_line, NULL );
diff --git a/src/arch/i386/core/i386_timer.c b/src/arch/i386/core/i386_timer.c
index 3608d8a6..4764e21e 100644
--- a/src/arch/i386/core/i386_timer.c
+++ b/src/arch/i386/core/i386_timer.c
@@ -191,4 +191,4 @@ int timer2_running(void)
 
 #endif /* RTC_CURRTICKS */
 
-INIT_FN ( INIT_TIMERS, setup_timers, NULL, NULL );
+INIT_FN ( INIT_TIMERS, setup_timers, NULL );
diff --git a/src/arch/i386/core/video_subr.c b/src/arch/i386/core/video_subr.c
index 7f3b96bf..dd6d5bd1 100644
--- a/src/arch/i386/core/video_subr.c
+++ b/src/arch/i386/core/video_subr.c
@@ -99,4 +99,4 @@ struct console_driver vga_console __console_driver = {
 	.disabled = 1,
 };
 
-INIT_FN ( INIT_CONSOLE, video_init, NULL, NULL );
+INIT_FN ( INIT_CONSOLE, video_init, NULL );
diff --git a/src/core/btext.c b/src/core/btext.c
index 6e1a29e1..0266f16b 100644
--- a/src/core/btext.c
+++ b/src/core/btext.c
@@ -417,7 +417,7 @@ struct console_driver btext_console __console_driver = {
 	.disabled = 1,
 };
 
-INIT_FN ( INIT_CONSOLE, btext_init, NULL, NULL );
+INIT_FN ( INIT_CONSOLE, btext_init, NULL );
 
 
 //come from linux/drivers/video/font-8x16.c
diff --git a/src/core/init.c b/src/core/init.c
index 66b428fe..61570fd1 100644
--- a/src/core/init.c
+++ b/src/core/init.c
@@ -23,15 +23,6 @@ void call_init_fns ( void ) {
 	}
 }
 
-void call_reset_fns ( void ) {
-	struct init_fn *init_fn;
-
-	for ( init_fn = init_fns; init_fn < init_fns_end ; init_fn++ ) {
-		if ( init_fn->reset )
-			init_fn->reset ();
-	}
-}
-
 void call_exit_fns ( void ) {
 	struct init_fn *init_fn;
 
diff --git a/src/core/pcmcia.c b/src/core/pcmcia.c
index 53d45416..3db9b84d 100644
--- a/src/core/pcmcia.c
+++ b/src/core/pcmcia.c
@@ -264,6 +264,6 @@ static void	pcmcia_shutdown_all(void) {
 	printf("Shutdown of PCMCIA subsystem completed");
 }
 
-INIT_FN ( INIT_PCMCIA, pcmcia_init_all, NULL, pcmcia_shutdown_all );
+INIT_FN ( INIT_PCMCIA, pcmcia_init_all, pcmcia_shutdown_all );
 
 #endif
diff --git a/src/core/serial.c b/src/core/serial.c
index 63040377..3e4543bb 100644
--- a/src/core/serial.c
+++ b/src/core/serial.c
@@ -250,5 +250,5 @@ struct console_driver serial_console __console_driver = {
 	.disabled = 1,
 };
 
-INIT_FN ( INIT_CONSOLE, serial_init, NULL, serial_fini );
+INIT_FN ( INIT_CONSOLE, serial_init, serial_fini );
 
diff --git a/src/include/gpxe/init.h b/src/include/gpxe/init.h
index b13674ec..b5e2f864 100644
--- a/src/include/gpxe/init.h
+++ b/src/include/gpxe/init.h
@@ -30,7 +30,6 @@
 
 struct init_fn {
 	void ( *init ) ( void );
-	void ( *reset ) ( void );
 	void ( *exit ) ( void );
 };
 
@@ -44,18 +43,16 @@ struct init_fn {
 #define	INIT_RPC	11
 
 /* Macro for creating an initialisation function table entry */
-#define INIT_FN( init_order, init_func, reset_func, exit_func )	\
+#define INIT_FN( init_order, init_func, exit_func )	\
 	struct init_fn PREFIX_OBJECT(init_fn__)			\
 	    __table ( struct init_fn, init_fn, init_order ) = {	\
 		.init = init_func,				\
-		.reset = reset_func,				\
 		.exit = exit_func,				\
 	};
 
 /* Function prototypes */
 
 void call_init_fns ( void );
-void call_reset_fns ( void );
 void call_exit_fns ( void );
 
 #endif /* _GPXE_INIT_H */
diff --git a/src/proto/nfs.c b/src/proto/nfs.c
index 2743287f..e21503c2 100644
--- a/src/proto/nfs.c
+++ b/src/proto/nfs.c
@@ -608,7 +608,7 @@ nfssymlink:
 	return 1;
 }
 
-INIT_FN ( INIT_RPC, rpc_init, nfs_reset, nfs_reset );
+INIT_FN ( INIT_RPC, rpc_init, nfs_reset );
 
 struct protocol nfs_protocol __protocol = {
 	.name = "nfs",
-- 
cgit v1.2.3-55-g7522