We don't actually use the reset functions anywhere, and nothing really

provides them.

diff --git a/src/arch/i386/core/cpu.c b/src/arch/i386/core/cpu.c
index 2d2e1888ee3e84fdc9840f1429681f114bafbb4a..b43ee425d4bf21ff134b8a09e0aabfe869979fed 100644 (file)
--- 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 ebe5893bd90b162e9d6958616bd97c6bab3649fa..1e0cadec887aa08e65d4d659899396958225bcee 100644 (file)
--- 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 3608d8a69c5160bade57a89dc77f122c37212e08..4764e21e3fe9129051005ed85e88dc3e72e4897c 100644 (file)
--- 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 7f3b96bf69ea4d69dc9d051054614af78759216d..dd6d5bd18d6e84447d1e78255e3d4e6a35301c1f 100644 (file)
--- 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 6e1a29e1674a6bb2fa6fb05fb4ddfc8c65b8d691..0266f16b65f7aa9d7f698977bec77e36a424d279 100644 (file)
--- 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 66b428fee7375190da3e50c674f302d4bb85d14f..61570fd171c6910ed1184b35c833718ed6adf8e8 100644 (file)
--- 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 53d45416003b7bfab9c3853551198288f9593a8e..3db9b84d6b459f56c211d63661ff8ac0f2584614 100644 (file)
--- 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 6304037748f1d56bf17b4ed81e70f508258be3ae..3e4543bbc7542747772df026525383b617efef18 100644 (file)
--- 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 b13674ec70c87a954714d49c2efe2e0c932bc293..b5e2f864f8a0a1078ffe1809e7b6cadfbd2927ef 100644 (file)
--- 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 2743287f7daf73368f72c6bdb287e25f7be54282..e21503c290e32ba3042daec8f599fbc5b3228d87 100644 (file)
--- 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",